Fix missing #include

[minetest.git] / src / mapblock.cpp

diff --git a/src/mapblock.cpp b/src/mapblock.cpp
index 942457407494f5b70003b81b1a1d3e53b8fb6d3b..f8747f52bafa96c8d06925a96b1b300b239f2a63 100644 (file)
--- a/src/mapblock.cpp
+++ b/src/mapblock.cpp
@@ -707,7 +707,7 @@ void MapBlock::deSerialize(std::istream &is, u8 version, bool disk)
                                &m_node_metadata, &m_node_timers,
                                m_gamedef->idef());
        } catch(SerializationError &e) {
-               errorstream<<"WARNING: MapBlock::deSerialize(): Ignoring an error"
+               warningstream<<"MapBlock::deSerialize(): Ignoring an error"
                                <<" while deserializing node metadata at ("
                                <<PP(getPos())<<": "<<e.what()<<std::endl;
        }
@@ -770,7 +770,7 @@ void MapBlock::deSerializeNetworkSpecific(std::istream &is)
        }
        catch(SerializationError &e)
        {
-               errorstream<<"WARNING: MapBlock::deSerializeNetworkSpecific(): Ignoring an error"
+               warningstream<<"MapBlock::deSerializeNetworkSpecific(): Ignoring an error"
                                <<": "<<e.what()<<std::endl;
        }
 }
@@ -796,13 +796,13 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk)
                char tmp;
                is.read(&tmp, 1);
                if (is.gcount() != 1)
-                       throw SerializationError(std::string(__FUNCTION_NAME)
-                               + ": no enough input data");
+                       throw SerializationError(std::string(FUNCTION_NAME)
+                               + ": not enough input data");
                is_underground = tmp;
                is.read((char *)*databuf_nodelist, nodecount * ser_length);
                if ((u32)is.gcount() != nodecount * ser_length)
-                       throw SerializationError(std::string(__FUNCTION_NAME)
-                               + ": no enough input data");
+                       throw SerializationError(std::string(FUNCTION_NAME)
+                               + ": not enough input data");
        } else if (version <= 10) {
                u8 t8;
                is.read((char *)&t8, 1);
@@ -814,8 +814,8 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk)
                        decompress(is, os, version);
                        std::string s = os.str();
                        if (s.size() != nodecount)
-                               throw SerializationError(std::string(__FUNCTION_NAME)
-                                       + ": no enough input data");
+                               throw SerializationError(std::string(FUNCTION_NAME)
+                                       + ": not enough input data");
                        for (u32 i = 0; i < s.size(); i++) {
                                databuf_nodelist[i*ser_length] = s[i];
                        }
@@ -826,8 +826,8 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk)
                        decompress(is, os, version);
                        std::string s = os.str();
                        if (s.size() != nodecount)
-                               throw SerializationError(std::string(__FUNCTION_NAME)
-                                       + ": no enough input data");
+                               throw SerializationError(std::string(FUNCTION_NAME)
+                                       + ": not enough input data");
                        for (u32 i = 0; i < s.size(); i++) {
                                databuf_nodelist[i*ser_length + 1] = s[i];
                        }
@@ -839,8 +839,8 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk)
                        decompress(is, os, version);
                        std::string s = os.str();
                        if (s.size() != nodecount)
-                               throw SerializationError(std::string(__FUNCTION_NAME)
-                                       + ": no enough input data");
+                               throw SerializationError(std::string(FUNCTION_NAME)
+                                       + ": not enough input data");
                        for (u32 i = 0; i < s.size(); i++) {
                                databuf_nodelist[i*ser_length + 2] = s[i];
                        }
@@ -859,7 +859,7 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk)
                decompress(is, os, version);
                std::string s = os.str();
                if (s.size() != nodecount * 3)
-                       throw SerializationError(std::string(__FUNCTION_NAME)
+                       throw SerializationError(std::string(FUNCTION_NAME)
                                + ": decompress resulted in size other than nodecount*3");
 
                // deserialize nodes from buffer
@@ -891,7 +891,7 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk)
                                                m_gamedef->idef());
                                }
                        } catch(SerializationError &e) {
-                               errorstream<<"WARNING: MapBlock::deSerialize(): Ignoring an error"
+                               warningstream<<"MapBlock::deSerialize(): Ignoring an error"
                                                <<" while deserializing node metadata"<<std::endl;
                        }
                }
@@ -910,7 +910,7 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk)
                        u16 count = readU16(is);
                        // Not supported and length not known if count is not 0
                        if(count != 0){
-                               errorstream<<"WARNING: MapBlock::deSerialize_pre22(): "
+                               warningstream<<"MapBlock::deSerialize_pre22(): "
                                                <<"Ignoring stuff coming at and after MBOs"<<std::endl;
                                return;
                        }