oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-02 16:38:41 +00:00
Code Wiki Activity

C++11 patchset 2: remove util/cpp11.h and util/cpp11_container.h (#5821)

Browse source
This commit is contained in:
Loïc Blot 2017-06-04 21:00:04 +02:00 • committed by GitHub
parent 2362d3f926
commit a98baef5e4
59 changed files with 223 additions and 298 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/serverenvironment.h
View file

@ -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