Merge pull request #470 from erichkeane/develop

Change StaticObject instance management to hopefully avoid UBSAN
USCiLab · Mar 16, 2018 · 0cf8150 · 0cf8150
2 parents 9aa7f39 + e9234e3
commit 0cf8150
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/include/cereal/details/static_object.hpp b/include/cereal/details/static_object.hpp
@@ -67,13 +67,12 @@ namespace cereal
     class CEREAL_DLL_EXPORT StaticObject
     {
       private:
-        //! Forces instantiation at pre-execution time
-        static void instantiate( T const * ) {}
 
         static T & create()
         {
           static T t;
-          instantiate(&instance);
+          //! Forces instantiation at pre-execution time
+          (void)instance;
           return t;
         }