X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fnameidmapping.cpp;h=ed59ddd16848b7c0a7db53d198c797562b14752a;hb=8f49358153637bb87f492e558a13cf9f23046e64;hp=0fb6632784e960e7d2886236fe425c38814532c0;hpb=c0f6395cf09f658eb95365c60f67b8a89104cb23;p=dragonfireclient.git diff --git a/src/nameidmapping.cpp b/src/nameidmapping.cpp index 0fb663278..ed59ddd16 100644 --- a/src/nameidmapping.cpp +++ b/src/nameidmapping.cpp @@ -1,24 +1,25 @@ /* -Minetest-c55 -Copyright (C) 2011 celeron55, Perttu Ahola +Minetest +Copyright (C) 2013 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +GNU Lesser General Public License for more details. -You should have received a copy of the GNU General Public License along +You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "nameidmapping.h" -#include "utility.h" +#include "exceptions.h" +#include "util/serialize.h" void NameIdMapping::serialize(std::ostream &os) const { @@ -26,7 +27,7 @@ void NameIdMapping::serialize(std::ostream &os) const writeU16(os, m_id_to_name.size()); for(std::map::const_iterator i = m_id_to_name.begin(); - i != m_id_to_name.end(); i++){ + i != m_id_to_name.end(); ++i){ writeU16(os, i->first); os<second); }