Merge branch 'auric-patch-1' into develop

see #345
USCiLab · Oct 12, 2016 · fc57d93 · fc57d93
2 parents f4ae56a + 8c1517d
commit fc57d93
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/include/cereal/details/static_object.hpp b/include/cereal/details/static_object.hpp
@@ -109,6 +109,7 @@ namespace cereal
         static LockGuard lock()
         {
           #if CEREAL_THREAD_SAFE
+          static std::mutex instanceMutex;
           return LockGuard{instanceMutex};
           #else
           return LockGuard{};
@@ -117,15 +118,9 @@ namespace cereal
 
       private:
         static T & instance;
-        #if CEREAL_THREAD_SAFE
-        static std::mutex instanceMutex;
-        #endif
     };
 
     template <class T> T & StaticObject<T>::instance = StaticObject<T>::create();
-    #if CEREAL_THREAD_SAFE
-    template <class T> std::mutex StaticObject<T>::instanceMutex;
-    #endif
   } // namespace detail
 } // namespace cereal