From 34492ce4803982a0aab84be88eab24b6ff0b4c3b Mon Sep 17 00:00:00 2001
From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Mon, 8 Aug 2011 16:15:53 +0200
Subject: [PATCH] Respect base virtual functions' signatures
---
src/debug.h | 2 +-
src/player.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/debug.h b/src/debug.h
index 234b7c74a..f3cfe88b3 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -85,7 +85,7 @@ public:
return c;
}
- int xsputn(const char *s, int n)
+ std::streamsize xsputn(const char *s, std::streamsize n)
{
for(int i=0; i<DEBUGSTREAM_COUNT; i++)
{
diff --git a/src/player.h b/src/player.h
index 78ca14948..b91c3cb1b 100644
--- a/src/player.h
+++ b/src/player.h
@@ -62,7 +62,7 @@ public:
return m_position;
}
- virtual void setPosition(v3f position)
+ virtual void setPosition(const v3f &position)
{
m_position = position;
}
@@ -206,7 +206,7 @@ public:
return m_box;
}
- void setPosition(v3f position)
+ void setPosition(const v3f &position)
{
m_oldpos = m_showpos;
--
2.25.1