summaryrefslogtreecommitdiff
path: root/src/inventory.cpp
diff options
context:
space:
mode:
authorShadowNinja <shadowninja@minetest.net>2015-10-14 02:39:30 -0400
committerkwolekr <kwolekr@minetest.net>2015-10-14 02:39:37 -0400
commit6f2d785d0ff761961912d7e79a7d16c4adf86861 (patch)
tree3b96b197cc58b3a4bd30663cb66cf2aca630e77d /src/inventory.cpp
parent6f4d6cb5741d10e10dacc78e264e421bf6a297cf (diff)
downloadminetest-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/inventory.cpp')
-rw-r--r--src/inventory.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 67f979b13..e89993e63 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -126,7 +126,7 @@ ItemStack::ItemStack(std::string name_, u16 count_,
void ItemStack::serialize(std::ostream &os) const
{
- DSTACK(__FUNCTION_NAME);
+ DSTACK(FUNCTION_NAME);
if(empty())
return;
@@ -151,7 +151,7 @@ void ItemStack::serialize(std::ostream &os) const
void ItemStack::deSerialize(std::istream &is, IItemDefManager *itemdef)
{
- DSTACK(__FUNCTION_NAME);
+ DSTACK(FUNCTION_NAME);
clear();