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

1 files changed, 9 insertions, 9 deletions

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index be1c52fe6..90d830ce3 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -213,7 +213,7 @@ void UnitSAO::removeAttachmentChild(int child_id)
 	m_attachment_child_ids.erase(child_id);
 }
 
-const UNORDERED_SET<int> &UnitSAO::getAttachmentChildIds()
+const std::unordered_set<int> &UnitSAO::getAttachmentChildIds()
 {
 	return m_attachment_child_ids;
 }
@@ -263,7 +263,7 @@ LuaEntitySAO::~LuaEntitySAO()
 		m_env->getScriptIface()->luaentity_Remove(m_id);
 	}
 
-	for (UNORDERED_SET<u32>::iterator it = m_attached_particle_spawners.begin();
+	for (std::unordered_set<u32>::iterator it = m_attached_particle_spawners.begin();
 		it != m_attached_particle_spawners.end(); ++it) {
 		m_env->deleteParticleSpawner(*it, false);
 	}
@@ -461,7 +461,7 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
 
 	if(m_bone_position_sent == false){
 		m_bone_position_sent = true;
-		for (UNORDERED_MAP<std::string, core::vector2d<v3f> >::const_iterator
+		for (std::unordered_map<std::string, core::vector2d<v3f>>::const_iterator
 				ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii){
 			std::string str = gob_cmd_update_bone_position((*ii).first,
 					(*ii).second.X, (*ii).second.Y);
@@ -498,7 +498,7 @@ std::string LuaEntitySAO::getClientInitializationData(u16 protocol_version)
 	msg_os << serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
 	msg_os << serializeLongString(gob_cmd_update_animation(
 		m_animation_range, m_animation_speed, m_animation_blend, m_animation_loop)); // 3
-	for (UNORDERED_MAP<std::string, core::vector2d<v3f> >::const_iterator
+	for (std::unordered_map<std::string, core::vector2d<v3f>>::const_iterator
 			ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii) {
 		msg_os << serializeLongString(gob_cmd_update_bone_position((*ii).first,
 				(*ii).second.X, (*ii).second.Y)); // m_bone_position.size
@@ -506,7 +506,7 @@ std::string LuaEntitySAO::getClientInitializationData(u16 protocol_version)
 	msg_os << serializeLongString(gob_cmd_update_attachment(m_attachment_parent_id,
 		m_attachment_bone, m_attachment_position, m_attachment_rotation)); // 4
 	int message_count = 4 + m_bone_position.size();
-	for (UNORDERED_SET<int>::const_iterator ii = m_attachment_child_ids.begin();
+	for (std::unordered_set<int>::const_iterator ii = m_attachment_child_ids.begin();
 			(ii != m_attachment_child_ids.end()); ++ii) {
 		if (ServerActiveObject *obj = m_env->getActiveObject(*ii)) {
 			message_count++;
@@ -868,7 +868,7 @@ void PlayerSAO::removingFromEnvironment()
 	ServerActiveObject::removingFromEnvironment();
 	if (m_player->getPlayerSAO() == this) {
 		unlinkPlayerSessionAndSave();
-		for (UNORDERED_SET<u32>::iterator it = m_attached_particle_spawners.begin();
+		for (std::unordered_set<u32>::iterator it = m_attached_particle_spawners.begin();
 			it != m_attached_particle_spawners.end(); ++it) {
 			m_env->deleteParticleSpawner(*it, false);
 		}
@@ -893,7 +893,7 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version)
 	msg_os << serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
 	msg_os << serializeLongString(gob_cmd_update_animation(
 		m_animation_range, m_animation_speed, m_animation_blend, m_animation_loop)); // 3
-	for (UNORDERED_MAP<std::string, core::vector2d<v3f> >::const_iterator
+	for (std::unordered_map<std::string, core::vector2d<v3f>>::const_iterator
 			ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii) {
 		msg_os << serializeLongString(gob_cmd_update_bone_position((*ii).first,
 			(*ii).second.X, (*ii).second.Y)); // m_bone_position.size
@@ -906,7 +906,7 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version)
 	// (GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES) : Deprecated, for backwards compatibility only.
 	msg_os << serializeLongString(gob_cmd_update_nametag_attributes(m_prop.nametag_color)); // 6
 	int message_count = 6 + m_bone_position.size();
-	for (UNORDERED_SET<int>::const_iterator ii = m_attachment_child_ids.begin();
+	for (std::unordered_set<int>::const_iterator ii = m_attachment_child_ids.begin();
 			ii != m_attachment_child_ids.end(); ++ii) {
 		if (ServerActiveObject *obj = m_env->getActiveObject(*ii)) {
 			message_count++;
@@ -1083,7 +1083,7 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 
 	if (!m_bone_position_sent) {
 		m_bone_position_sent = true;
-		for (UNORDERED_MAP<std::string, core::vector2d<v3f> >::const_iterator
+		for (std::unordered_map<std::string, core::vector2d<v3f>>::const_iterator
 				ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii) {
 			std::string str = gob_cmd_update_bone_position((*ii).first,
 					(*ii).second.X, (*ii).second.Y);