diff options
| author | Weblate <42@minetest.ru> | 2013-03-30 19:49:52 +0100 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-03-30 19:49:52 +0100 |
| commit | a0566270d9fa075afa36a7e3e68c690b1b23ba90 (patch) | |
| tree | 6bc88127ee67b7bf4d6a2d6f9d0a9e5f997d1dd1 /src/clientobject.h | |
| parent | 0d83bdc3aa9f1077836aacb833ac4ad9bbb9a4f4 (diff) | |
| parent | 1aa50b13622c1e264044839ecdf0152670dae6ce (diff) | |
| download | minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.tar.gz minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.tar.bz2 minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/clientobject.h')
| -rw-r--r-- | src/clientobject.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/clientobject.h b/src/clientobject.h index d1ee366cf..8cbf3d60b 100644 --- a/src/clientobject.h +++ b/src/clientobject.h @@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "irrlichttypes_extrabloated.h" #include "activeobject.h" +#include <map> /* @@ -96,7 +97,7 @@ protected: ClientEnvironment *m_env; private: // Used for creating objects based on type - static core::map<u16, Factory> m_types; + static std::map<u16, Factory> m_types; }; struct DistanceSortedActiveObject @@ -110,7 +111,7 @@ struct DistanceSortedActiveObject d = a_d; } - bool operator < (DistanceSortedActiveObject &other) + bool operator < (const DistanceSortedActiveObject &other) const { return d < other.d; } |