X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fnameidmapping.cpp;h=bd5bb1fc8ce71394c300f6c01046e9aaee95ab70;hb=9a5d43a4f517e4f2e1810fe7c08b10e650552c52;hp=0e6090745fd36426a0f2b95b726f4ac3ec3fa48f;hpb=497ff1ecd64c8908f988e15ca879824f2781e3fd;p=minetest.git

diff --git a/src/nameidmapping.cpp b/src/nameidmapping.cpp
index 0e6090745..bd5bb1fc8 100644
--- a/src/nameidmapping.cpp
+++ b/src/nameidmapping.cpp
@@ -1,6 +1,6 @@
 /*
 Minetest
-Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -18,33 +18,31 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "nameidmapping.h"
+#include "exceptions.h"
 #include "util/serialize.h"
 
 void NameIdMapping::serialize(std::ostream &os) const
 {
 	writeU8(os, 0); // version
 	writeU16(os, m_id_to_name.size());
-	for(std::map<u16, std::string>::const_iterator
-			i = m_id_to_name.begin();
-			i != m_id_to_name.end(); i++){
-		writeU16(os, i->first);
-		os<<serializeString(i->second);
+	for (const auto &i : m_id_to_name) {
+		writeU16(os, i.first);
+		os << serializeString(i.second);
 	}
 }
 
 void NameIdMapping::deSerialize(std::istream &is)
 {
 	int version = readU8(is);
-	if(version != 0)
+	if (version != 0)
 		throw SerializationError("unsupported NameIdMapping version");
 	u32 count = readU16(is);
 	m_id_to_name.clear();
 	m_name_to_id.clear();
-	for(u32 i=0; i<count; i++){
+	for (u32 i = 0; i < count; i++) {
 		u16 id = readU16(is);
 		std::string name = deSerializeString(is);
 		m_id_to_name[id] = name;
 		m_name_to_id[name] = id;
 	}
 }
-