Merge branch 'develop' of github.com:USCiLab/cereal into develop

This commit is contained in:
Shane Grant 2014-03-08 23:26:01 -08:00
commit 94cb6d3ba8

View File

@ -320,17 +320,17 @@ namespace cereal
template <class Archive, class T>
struct polymorphic_serialization_support
{
#ifdef _MSC_VER
#ifdef _MSC_VER
//! Creates the appropriate bindings depending on whether the archive supports
//! saving or loading
virtual void instantiate();
#else // NOT _MSC_VER
#else // NOT _MSC_VER
//! Creates the appropriate bindings depending on whether the archive supports
//! saving or loading
static void instantiate();
//! This typedef causes the compiler to instantiate this static function
typedef instantiate_function<instantiate> unused;
#endif // _MSC_VER
#endif // _MSC_VER
};
// instantiate implementation