Move KeyList & InputHandler from game.h to client/inputhandler.h (#5752)

[oweals/minetest.git] / src / nameidmapping.cpp

diff --git a/src/nameidmapping.cpp b/src/nameidmapping.cpp
index bcddb45151406f9a1fd3f569eec6eba4f3d93433..d031f080848e42a4367dacca47ead4c59d8d73d8 100644 (file)
--- a/src/nameidmapping.cpp
+++ b/src/nameidmapping.cpp
@@ -18,33 +18,32 @@ 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++){
+       for (UNORDERED_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);
+               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;
        }
 }
-