diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2015-10-14 02:39:30 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2015-10-14 02:39:37 -0400 |
| commit | 6f2d785d0ff761961912d7e79a7d16c4adf86861 (patch) | |
| tree | 3b96b197cc58b3a4bd30663cb66cf2aca630e77d /src/content_nodemeta.cpp | |
| parent | 6f4d6cb5741d10e10dacc78e264e421bf6a297cf (diff) | |
| download | minetest-6f2d785d0ff761961912d7e79a7d16c4adf86861.tar.gz minetest-6f2d785d0ff761961912d7e79a7d16c4adf86861.tar.bz2 minetest-6f2d785d0ff761961912d7e79a7d16c4adf86861.zip | |
Rename macros with two leading underscores
These names are reserved for the compiler/library implementations.
Diffstat (limited to 'src/content_nodemeta.cpp')
| -rw-r--r-- | src/content_nodemeta.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp index 072800d6c..7f4264d8e 100644 --- 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; |