diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-11-20 15:19:50 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-11-20 15:19:50 +0000 |
| commit | 35d2fefb789751b8730c6f0fae674e72673228d0 (patch) | |
| tree | 185c267faed52cd416cdefa16d1e160d2b0d3c02 /src/properties.h | |
| parent | ca58ec1faedca0081ecd233f2cefa1ba783cebf4 (diff) | |
| download | mana-35d2fefb789751b8730c6f0fae674e72673228d0.tar.gz mana-35d2fefb789751b8730c6f0fae674e72673228d0.tar.bz2 mana-35d2fefb789751b8730c6f0fae674e72673228d0.tar.xz mana-35d2fefb789751b8730c6f0fae674e72673228d0.zip | |
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
........
Diffstat (limited to 'src/properties.h')
| -rw-r--r-- | src/properties.h | 7 |
1 files changed, 3 insertions, 4 deletions
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 * <code>false</code> otherwise. */ bool - hasProperty(const std::string &name) + hasProperty(const std::string &name) const { return (mProperties.find(name) != mProperties.end()); } |