From a98baef5e4fedca36c8c8755ad7c8233469f6a3f Mon Sep 17 00:00:00 2001
From: Loïc Blot <nerzhul@users.noreply.github.com>
Date: Sun, 4 Jun 2017 21:00:04 +0200
Subject: C++11 patchset 2: remove util/cpp11.h and util/cpp11_container.h
 (#5821)

---
 src/serverobject.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/serverobject.h')

diff --git a/src/serverobject.h b/src/serverobject.h
index 38204980e..3041910d1 100644
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef SERVEROBJECT_HEADER
 #define SERVEROBJECT_HEADER
 
+#include <unordered_set>
 #include "irrlichttypes_bloated.h"
 #include "activeobject.h"
 #include "inventorymanager.h"
@@ -166,8 +167,8 @@ public:
 	{}
 	virtual void removeAttachmentChild(int child_id)
 	{}
-	virtual const UNORDERED_SET<int> &getAttachmentChildIds()
-	{ static const UNORDERED_SET<int> rv; return rv; }
+	virtual const std::unordered_set<int> &getAttachmentChildIds()
+	{ static const std::unordered_set<int> rv; return rv; }
 	virtual ObjectProperties* accessObjectProperties()
 	{ return NULL; }
 	virtual void notifyObjectPropertiesModified()
@@ -251,7 +252,7 @@ protected:
 
 	ServerEnvironment *m_env;
 	v3f m_base_position;
-	UNORDERED_SET<u32> m_attached_particle_spawners;
+	std::unordered_set<u32> m_attached_particle_spawners;
 
 private:
 	// Used for creating objects based on type
-- 
cgit v1.2.3