generic-library/cereal
1
0
Fork 0
mirror of https://github.com/USCiLab/cereal.git synced 2025-10-18 01:45:52 +02:00
Code Issues Projects Releases Wiki Activity

Fixed a bug relating to overload resolution for loading types. ProcessImpl was taking a universal reference and the

Browse Source 
type traits were failing on T& as opposed to a T.  loading's processimpl now only takes refs.  we still let op() take
r-values in case someone passes it an nvp or something
This commit is contained in:
Shane Grant
2013-07-04 17:54:03 -07:00
parent cb6e04c8a6
commit 41d3098f8e
2 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/cereal/cereal.hpp
View File

@@ -230,7 +230,7 @@ namespace cereal
//! Serialization of a virtual_base_class wrapper
/*! \sa virtual_base_class */
template <class T> inline
ArchiveType & processImpl(virtual_base_class<T> b)
ArchiveType & processImpl(virtual_base_class<T> const & b)
{
traits::detail::base_class_id id(b.base_ptr);
if(itsBaseClassSet.count(id) == 0)
@@ -244,7 +244,7 @@ namespace cereal
//! Serialization of a base_class wrapper
/*! \sa base_class */
template <class T> inline
ArchiveType & processImpl(base_class<T> b)
ArchiveType & processImpl(base_class<T> const & b)
{
self->processImpl( *b.base_ptr );
return *self;
@@ -450,7 +450,7 @@ namespace cereal
//! Serialization of a virtual_base_class wrapper
/*! \sa virtual_base_class */
template <class T> inline
ArchiveType & processImpl(virtual_base_class<T> b)
ArchiveType & processImpl(virtual_base_class<T> & b)
{
traits::detail::base_class_id id(b.base_ptr);
if(itsBaseClassSet.count(id) == 0)
@@ -464,7 +464,7 @@ namespace cereal
//! Serialization of a base_class wrapper
/*! \sa base_class */
template <class T> inline
ArchiveType & processImpl(base_class<T> b)
ArchiveType & processImpl(base_class<T> & b)
{
self->processImpl( *b.base_ptr );
return *self;
@@ -476,7 +476,7 @@ namespace cereal
typename std::enable_if<traits::is_specialized_member_serialize<T, ArchiveType>() ||
(traits::is_input_serializable<T, ArchiveType>() && traits::has_member_serialize<T, ArchiveType>()),
ArchiveType &>::type
processImpl(T && t)
processImpl(T & t)
{
access::member_serialize(*self, t);
return *self;
@@ -487,9 +487,9 @@ namespace cereal
typename std::enable_if<traits::is_specialized_non_member_serialize<T, ArchiveType>() ||
(traits::is_input_serializable<T, ArchiveType>() && traits::has_non_member_serialize<T, ArchiveType>()),
ArchiveType &>::type
processImpl(T && t)
processImpl(T & t)
{
serialize(*self, std::forward<T>(t));
serialize(*self, t);
return *self;
}
@@ -498,7 +498,7 @@ namespace cereal
typename std::enable_if<traits::is_specialized_member_load_save<T, ArchiveType>() ||
(traits::is_input_serializable<T, ArchiveType>() && traits::has_member_load<T, ArchiveType>()),
ArchiveType &>::type
processImpl(T && t)
processImpl(T & t)
{
access::member_load(*self, t);
return *self;
@@ -509,9 +509,9 @@ namespace cereal
typename std::enable_if<traits::is_specialized_non_member_load_save<T, ArchiveType>() ||
(traits::is_input_serializable<T, ArchiveType>() && traits::has_non_member_load<T, ArchiveType>()),
ArchiveType &>::type
processImpl(T && t)
processImpl(T & t)
{
load(*self, std::forward<T>(t));
load(*self, t);
return *self;
}

38
sandbox_rtti.cpp
View File

@@ -153,12 +153,23 @@ struct DerivedVirtual : public virtual BaseVirtual
}
};
struct TestType
{
int x;
template <class Archive>
void serialize( Archive & ar )
{
ar( x );
};
};
namespace cereal
{
template <class Archive> struct specialize<Archive, DerivedVirtual, cereal::specialization::member_load_save> {};
template <class Archive> struct specialize<Archive, TestType, cereal::specialization::member_serialize> {};
}
//CEREAL_REGISTER_TYPE(DerivedVirtual);
CEREAL_REGISTER_TYPE(DerivedVirtual);
template <class T> void nop(T&&) {}
@@ -166,19 +177,20 @@ int main()
{
std::cout << std::boolalpha;
std::cout << cereal::traits::is_specialized_member_load_save<DerivedVirtual, cereal::BinaryOutputArchive>() << std::endl;
//std::cout << cereal::traits::is_specialized_non_member_serialize<DerivedVirtual, cereal::BinaryOutputArchive>() << std::endl;
std::cout << cereal::traits::is_output_serializable<DerivedVirtual, cereal::BinaryOutputArchive>() << std::endl;
//std::cout << cereal::traits::has_non_member_serialize<DerivedVirtual, cereal::BinaryOutputArchive>() << std::endl;
//std::cout << cereal::traits::is_specialized_member_serialize<DerivedVirtual, cereal::BinaryOutputArchive>() << std::endl;
std::cout << cereal::traits::has_member_serialize<DerivedVirtual, cereal::BinaryOutputArchive>() << std::endl;
std::cout << cereal::traits::is_specialized_member_load_save<DerivedVirtual, cereal::BinaryInputArchive>() << std::endl;
std::cout << cereal::traits::is_specialized_member_load_save<DerivedVirtual&, cereal::BinaryInputArchive>() << std::endl;
//std::cout << cereal::traits::is_specialized_non_member_serialize<DerivedVirtual, cereal::BinaryInputArchive>() << std::endl;
//std::cout << cereal::traits::is_input_serializable<DerivedVirtual, cereal::BinaryInputArchive>() << std::endl;
//std::cout << cereal::traits::has_non_member_serialize<DerivedVirtual, cereal::BinaryInputArchive>() << std::endl;
//std::cout << cereal::traits::is_specialized_member_serialize<DerivedVirtual, cereal::BinaryInputArchive>() << std::endl;
std::cout << cereal::traits::has_member_serialize<DerivedVirtual, cereal::BinaryInputArchive>() << std::endl;
std::cout << "sssssssssssss" <<std::endl;
std::cout << cereal::traits::has_member_save<DerivedVirtual, cereal::BinaryOutputArchive>() << std::endl;
std::cout << cereal::traits::is_non_const_member_save<DerivedVirtual, cereal::BinaryOutputArchive>() << std::endl;
std::cout << cereal::traits::detail::has_member_save_any<DerivedVirtual, cereal::BinaryOutputArchive>() << std::endl;
std::cout << cereal::traits::has_non_member_save<DerivedVirtual, cereal::BinaryOutputArchive>() << std::endl;
std::cout << cereal::traits::has_member_serialize<DerivedVirtual, cereal::BinaryOutputArchive>() << std::endl;
std::cout << cereal::traits::has_non_member_serialize<DerivedVirtual, cereal::BinaryOutputArchive>() << std::endl;
std::cout << cereal::traits::has_member_load<DerivedVirtual, cereal::BinaryInputArchive>() << std::endl;
//std::cout << cereal::traits::has_non_member_load<DerivedVirtual, cereal::BinaryInputArchive>() << std::endl;
std::cout << cereal::traits::has_member_serialize<DerivedVirtual, cereal::BinaryInputArchive>() << std::endl;
//std::cout << cereal::traits::has_non_member_serialize<DerivedVirtual, cereal::BinaryInputArchive>() << std::endl;
{