diff options
| author | Ilya Zhuravlev <zhuravlevilya@ya.ru> | 2012-12-20 21:19:49 +0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2013-03-11 19:08:39 -0400 |
| commit | 6a1670dbc31cc0e44178bbd9ad34ff0d5981a060 (patch) | |
| tree | ce32cd4be20e9be30367f2ad25d9dae6a0482898 /src/staticobject.h | |
| parent | e204bedf1d781e43b8caa334a99319efc5b7ce46 (diff) | |
| download | minetest-6a1670dbc31cc0e44178bbd9ad34ff0d5981a060.tar.gz minetest-6a1670dbc31cc0e44178bbd9ad34ff0d5981a060.tar.bz2 minetest-6a1670dbc31cc0e44178bbd9ad34ff0d5981a060.zip | |
Migrate to STL containers/algorithms.
Diffstat (limited to 'src/staticobject.h')
| -rw-r--r-- | src/staticobject.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/staticobject.h b/src/staticobject.h index c8427fe47..640747e96 100644 --- a/src/staticobject.h +++ b/src/staticobject.h @@ -23,6 +23,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "irrlichttypes_bloated.h" #include <string> #include <sstream> +#include <list> +#include <map> #include "debug.h" struct StaticObject @@ -62,27 +64,27 @@ public: } else { - if(m_active.find(id) != NULL) + if(m_active.find(id) != m_active.end()) { dstream<<"ERROR: StaticObjectList::insert(): " <<"id already exists"<<std::endl; assert(0); return; } - m_active.insert(id, obj); + m_active[id] = obj; } } void remove(u16 id) { assert(id != 0); - if(m_active.find(id) == NULL) + if(m_active.find(id) == m_active.end()) { dstream<<"WARNING: StaticObjectList::remove(): id="<<id <<" not found"<<std::endl; return; } - m_active.remove(id); + m_active.erase(id); } void serialize(std::ostream &os); @@ -93,8 +95,8 @@ public: from m_stored and inserted to m_active. The caller directly manipulates these containers. */ - core::list<StaticObject> m_stored; - core::map<u16, StaticObject> m_active; + std::list<StaticObject> m_stored; + std::map<u16, StaticObject> m_active; private: }; |