diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-04 21:00:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-04 21:00:04 +0200 |
| commit | a98baef5e4fedca36c8c8755ad7c8233469f6a3f (patch) | |
| tree | c40d1468774cf988b4567f33e89875e0c43803a7 /src/clientenvironment.h | |
| parent | 2362d3f926e2702585f60011d4cea90b4faf4bd6 (diff) | |
| download | minetest-a98baef5e4fedca36c8c8755ad7c8233469f6a3f.tar.gz minetest-a98baef5e4fedca36c8c8755ad7c8233469f6a3f.tar.bz2 minetest-a98baef5e4fedca36c8c8755ad7c8233469f6a3f.zip | |
C++11 patchset 2: remove util/cpp11.h and util/cpp11_container.h (#5821)
Diffstat (limited to 'src/clientenvironment.h')
| -rw-r--r-- | src/clientenvironment.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/clientenvironment.h b/src/clientenvironment.h index 79b4797ad..2906553f0 100644 --- a/src/clientenvironment.h +++ b/src/clientenvironment.h @@ -64,6 +64,7 @@ struct ClientEnvEvent }; }; +typedef std::unordered_map<u16, ClientActiveObject*> ClientActiveObjectMap; class ClientEnvironment : public Environment { public: @@ -181,7 +182,7 @@ private: Client *m_client; ClientScripting *m_script; IrrlichtDevice *m_irr; - UNORDERED_MAP<u16, ClientActiveObject*> m_active_objects; + ClientActiveObjectMap m_active_objects; std::vector<ClientSimpleObject*> m_simple_objects; std::queue<ClientEnvEvent> m_client_event_queue; IntervalLimiter m_active_object_light_update_interval; |