summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2011-08-08 16:15:53 +0200
committerGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2011-08-08 16:15:53 +0200
commit34492ce4803982a0aab84be88eab24b6ff0b4c3b (patch)
tree252e399aa5d129b99754874062307550d3bcf9f6
parent163c38e175f7604ae5d1e3de20674f0da5e21b9c (diff)
downloadminetest-34492ce4803982a0aab84be88eab24b6ff0b4c3b.tar.gz
minetest-34492ce4803982a0aab84be88eab24b6ff0b4c3b.tar.bz2
minetest-34492ce4803982a0aab84be88eab24b6ff0b4c3b.zip
Respect base virtual functions' signatures
-rw-r--r--src/debug.h2
-rw-r--r--src/player.h4
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;