Update minetest.conf.example and src/settings_translation_file.cpp

[dragonfireclient.git] / src / content_nodemeta.cpp

diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp
index 072800d6c9c0302597d8fcf1c3e38b7b9e6165ea..7f4264d8e6e284bd8d21ffc37ed2c3777c45026b 100644 (file)
--- a/src/content_nodemeta.cpp
+++ b/src/content_nodemeta.cpp
@@ -154,9 +154,9 @@ void content_nodemeta_deserialize_legacy(std::istream &is,
 
        if(version > 1)
        {
-               infostream<<__FUNCTION_NAME<<": version "<<version<<" not supported"
+               infostream<<FUNCTION_NAME<<": version "<<version<<" not supported"
                                <<std::endl;
-               throw SerializationError(__FUNCTION_NAME);
+               throw SerializationError(FUNCTION_NAME);
        }
 
        u16 count = readU16(is);
@@ -174,7 +174,7 @@ void content_nodemeta_deserialize_legacy(std::istream &is,
 
                if(meta->get(p) != NULL)
                {
-                       warningstream<<__FUNCTION_NAME<<": "
+                       warningstream<<FUNCTION_NAME<<": "
                                        <<"already set data at position"
                                        <<"("<<p.X<<","<<p.Y<<","<<p.Z<<"): Ignoring."
                                        <<std::endl;