boost/serialization
2
0
Fork 0
mirror of https://github.com/boostorg/serialization.git synced 2026-02-08 23:12:15 +00:00
Code Issues Projects Releases Wiki Activity

correction for shared_ptr_helper and test_unique_ptr

Browse Source
This commit is contained in:
Robert Ramey
2014-02-20 08:33:32 -08:00
parent fb559afd0d
commit ed0ba055c8
2 changed files with 39 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
include/boost/serialization/shared_ptr_helper.hpp
View File

@@ -101,6 +101,26 @@ public:
const unsigned int file_version
);
#endif
template<class U>
struct non_polymorphic {
static const boost::serialization::extended_type_info *
get_object_type(U & ){
return & boost::serialization::singleton<
BOOST_DEDUCED_TYPENAME
boost::serialization::type_info_implementation< U >::type
>::get_const_instance();
}
};
template<class U>
struct polymorphic {
static const boost::serialization::extended_type_info *
get_object_type(U & u){
return boost::serialization::singleton<
BOOST_DEDUCED_TYPENAME
boost::serialization::type_info_implementation< U >::type
>::get_const_instance().get_derived_extended_type_info(u);
}
};
public:
template<class T>
@@ -113,30 +133,12 @@ public:
= & boost::serialization::type_info_implementation< T >::type
::get_const_instance();
struct non_polymorphic {
static const boost::serialization::extended_type_info *
get_object_type(T &){
return & boost::serialization::singleton<
BOOST_DEDUCED_TYPENAME
boost::serialization::type_info_implementation< T >::type
>::get_const_instance();
}
};
struct polymorphic {
static const boost::serialization::extended_type_info *
get_object_type(T & t){
return boost::serialization::singleton<
BOOST_DEDUCED_TYPENAME
boost::serialization::type_info_implementation< T >::type
>::get_const_instance().get_derived_extended_type_info(t);
}
};
// get pointer to the most derived object's eti. This is effectively
// the object type identifer
typedef BOOST_DEDUCED_TYPENAME mpl::if_<
is_polymorphic< T >,
polymorphic,
non_polymorphic
polymorphic<T>,
non_polymorphic<T>
>::type type;
const boost::serialization::extended_type_info * true_type