Fixes need for special MSVC case, see USCiLab#373

headupinclouds · Feb 7, 2017 · b827b95 · b827b95
1 parent fb6606d
commit b827b95
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/unittests/polymorphic.hpp b/unittests/polymorphic.hpp
@@ -53,17 +53,14 @@ struct PolyBaseAA : PolyBaseA
     ar( w );
   }
 
-  static void doesNothing()
-  {
-    cereal::detail::RegisterPolymorphicCaster<PolyBaseA, PolyBaseAA>::bind();
-  }
-
   bool operator==( PolyBaseAA const & other ) const
   {
     return w == other.w;
   }
 };
 
+CEREAL_REGISTER_POLYMORPHIC_RELATION(PolyBaseA, PolyBaseAA)
+
 struct PolyBaseB : virtual PolyBaseAA
 {
   PolyBaseB() {}
@@ -131,9 +128,6 @@ struct PolyDerivedD : PolyBaseB, PolyBaseC
 };
 
 CEREAL_REGISTER_TYPE(PolyDerivedD)
-#ifdef _MSC_VER
-CEREAL_REGISTER_POLYMORPHIC_RELATION(PolyBaseA, PolyDerivedD)
-#endif
 
 struct PolyBase
 {