Merge remote-tracking branch 'origin/master' into pybind11

Author: arahlin

core/include/core/G3.h

@@ -18,18 +18,17 @@ CEREAL_CLASS_VERSION(x, version);  \
 CEREAL_REGISTER_TYPE_WITH_NAME(x, #x); \
 CEREAL_SPECIALIZE_FOR_ALL_ARCHIVES(x, cereal::specialization::member_load_save);
 
-// Serialization versioning
 template <class T>
 inline uint32_t
-_g3_class_version(T *)
+g3_class_version(T *)
 {
 	return cereal::detail::Version<T>::version;
 }
 
 #define G3_CHECK_VERSION(v) \
-	if ((uint32_t)v > _g3_class_version(this)) \
+	if ((uint32_t)v > g3_class_version(this)) \
 		log_fatal("Trying to read newer class version (%d) than " \
 		    "supported (%d). Please upgrade your software.", v, \
-		    _g3_class_version(this));
+		    g3_class_version(this));
 
 #endif