aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoic Blot <loic.blot@unix-experience.fr>2018-03-29 13:36:01 +0200
committerLoic Blot <loic.blot@unix-experience.fr>2018-03-29 13:37:24 +0200
commitef979ee2e9b3109e2b5348014e7ae4b3efdd666c (patch)
tree2b39a524cb4eafa58b5f46421972eb6d698adf50
parent83fc0fd2f1e1a1594ddc31dede65615fbf673365 (diff)
downloadminetest-ef979ee2e9b3109e2b5348014e7ae4b3efdd666c.tar.gz
minetest-ef979ee2e9b3109e2b5348014e7ae4b3efdd666c.tar.bz2
minetest-ef979ee2e9b3109e2b5348014e7ae4b3efdd666c.zip
Fix a warning reported by clang
minetest/src/script/cpp_api/s_player.h:27:1: warning: struct 'PlayerHPChangeReason' was previously declared as a class [-Wmismatched-tags] struct PlayerHPChangeReason;
-rw-r--r--src/script/cpp_api/s_base.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/cpp_api/s_base.h b/src/script/cpp_api/s_base.h
index dc7b581e3..6f61b6b84 100644
--- a/src/script/cpp_api/s_base.h
+++ b/src/script/cpp_api/s_base.h
@@ -72,7 +72,7 @@ class IGameDef;
class Environment;
class GUIEngine;
class ServerActiveObject;
-class PlayerHPChangeReason;
+struct PlayerHPChangeReason;
class ScriptApiBase {
public:
@@ -146,7 +146,7 @@ protected:
std::string m_last_run_mod;
bool m_secure = false;
#ifdef SCRIPTAPI_LOCK_DEBUG
- int m_lock_recursion_count;
+ int m_lock_recursion_count{};
std::thread::id m_owning_thread;
#endif