From 35d2fefb789751b8730c6f0fae674e72673228d0 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Tue, 20 Nov 2007 15:19:50 +0000 Subject: Merged revisions 3692 via svnmerge from https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk ........ r3692 | gmelquio | 2007-10-27 11:03:13 +0200 (Sat, 27 Oct 2007) | 1 line Made it compile with GCC 4.3 ........ --- src/properties.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/properties.h') diff --git a/src/properties.h b/src/properties.h index bcd114c1..93148bdf 100644 --- a/src/properties.h +++ b/src/properties.h @@ -49,7 +49,7 @@ class Properties * doesn't exist. */ const std::string& - getProperty(const std::string &name, const std::string &def = "") + getProperty(const std::string &name, const std::string &def = "") const { PropertyMap::const_iterator i = mProperties.find(name); return (i != mProperties.end()) ? i->second : def; @@ -63,8 +63,7 @@ class Properties * @return the value of the given property, or 0.0f when it doesn't * exist. */ - const float - getFloatProperty(const std::string &name, float def = 0.0f) + float getFloatProperty(std::string const &name, float def = 0.0f) const { PropertyMap::const_iterator i = mProperties.find(name); float ret = def; @@ -85,7 +84,7 @@ class Properties * false otherwise. */ bool - hasProperty(const std::string &name) + hasProperty(const std::string &name) const { return (mProperties.find(name) != mProperties.end()); } -- cgit v1.2.3-60-g2f50