From 247490dc84c6e82f39646a42b2a563762f6498e4 Mon Sep 17 00:00:00 2001 From: Yehonal Date: Sat, 16 Sep 2017 15:02:33 +0200 Subject: [PATCH] Core: Step 2 - Fixed warnings with clang 3.9+ issue #121 --- src/game/Globals/ObjectAccessor.cpp | 4 ---- src/game/Globals/ObjectAccessor.h | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/game/Globals/ObjectAccessor.cpp b/src/game/Globals/ObjectAccessor.cpp index 904448bc6..03c0fa21d 100644 --- a/src/game/Globals/ObjectAccessor.cpp +++ b/src/game/Globals/ObjectAccessor.cpp @@ -512,10 +512,6 @@ void ObjectAccessor::UnloadAll() std::map ObjectAccessor::playerNameToPlayerPointer; -/// Define the static members of HashMapHolder - -template UNORDERED_MAP< uint64, T* > HashMapHolder::m_objectMap; -template typename HashMapHolder::LockType HashMapHolder::i_lock; /// Global definitions for the hashmap storage diff --git a/src/game/Globals/ObjectAccessor.h b/src/game/Globals/ObjectAccessor.h index 148c55dcc..b51df205c 100644 --- a/src/game/Globals/ObjectAccessor.h +++ b/src/game/Globals/ObjectAccessor.h @@ -72,6 +72,11 @@ class HashMapHolder static MapType m_objectMap; }; +/// Define the static members of HashMapHolder + +template UNORDERED_MAP< uint64, T* > HashMapHolder::m_objectMap; +template typename HashMapHolder::LockType HashMapHolder::i_lock; + // pussywizard: class DelayedCorpseAction {