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/serverenvironment.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/serverenvironment.h')
| -rw-r--r-- | src/serverenvironment.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/serverenvironment.h b/src/serverenvironment.h index 7c370fd54..3b7bf8fb0 100644 --- a/src/serverenvironment.h +++ b/src/serverenvironment.h @@ -190,7 +190,7 @@ enum ClearObjectsMode { This is not thread-safe. Server uses an environment mutex. */ -typedef UNORDERED_MAP<u16, ServerActiveObject *> ActiveObjectMap; +typedef std::unordered_map<u16, ServerActiveObject *> ServerActiveObjectMap; class ServerEnvironment : public Environment { @@ -395,7 +395,7 @@ private: // World path const std::string m_path_world; // Active object list - ActiveObjectMap m_active_objects; + ServerActiveObjectMap m_active_objects; // Outgoing network message buffer for active objects std::queue<ActiveObjectMessage> m_active_object_messages; // Some timers @@ -431,8 +431,8 @@ private: // Particles IntervalLimiter m_particle_management_interval; - UNORDERED_MAP<u32, float> m_particle_spawners; - UNORDERED_MAP<u32, u16> m_particle_spawner_attachments; + std::unordered_map<u32, float> m_particle_spawners; + std::unordered_map<u32, u16> m_particle_spawner_attachments; }; #endif |