Simplification for pointer serialization

Correct error in exported pointers for polymorphic archives

[SVN r54936]
This commit is contained in:
Robert Ramey
2009-07-13 21:42:14 +00:00
parent 068700bd5a
commit a15e0eb5b6
16 changed files with 33 additions and 145 deletions

View File

@@ -12,7 +12,7 @@
# pragma warning (disable : 4786) // too long name, harmless warning
#endif
#include <stdlib.h> // for NULL
#include <set>
#define BOOST_ARCHIVE_SOURCE
#include <boost/archive/detail/basic_serializer.hpp>
@@ -25,61 +25,38 @@ namespace boost {
namespace archive {
namespace detail {
#if 0
BOOST_ARCHIVE_DECL(bool)
type_info_pointer_compare::operator()(
bool
basic_serializer_map::type_info_pointer_compare::operator()(
const basic_serializer * lhs, const basic_serializer * rhs
) const {
return *lhs < *rhs;
}
class basic_serializer_arg : public basic_serializer {
public:
basic_serializer_arg(const serialization::extended_type_info & eti) :
basic_serializer(eti)
{}
};
#endif
} // namespace detail
} // namespace archive
} // namespace boost
#if 0
BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY())
basic_serializer_map::basic_serializer_map(bool & deleted) :
m_deleted(deleted)
{
m_deleted = false;
}
BOOST_ARCHIVE_DECL(const basic_serializer *)
basic_serializer_map::tfind(
const boost::serialization::extended_type_info & eti
) const {
const basic_serializer_arg bs(eti);
map_type::const_iterator it;
boost::serialization::singleton<basic_serializer_map>::lease l;
it = l->m_map.find(& bs);
if(it == l->m_map.end())
return NULL;
return *it;
}
BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY())
basic_serializer_map::~basic_serializer_map(){
m_deleted = true;
}
BOOST_ARCHIVE_DECL(bool)
basic_serializer_map::insert(const basic_serializer * bs){
boost::serialization::singleton<basic_serializer_map>::lease l;
return l->m_map.insert(bs).second;
return m_map.insert(bs).second;
}
BOOST_ARCHIVE_DECL(void)
basic_serializer_map::erase(basic_serializer * bs){
boost::serialization::singleton<basic_serializer_map>::lease l;
l->m_map.erase(bs);
map_type::iterator it;
it = m_map.find(bs);
assert(it != m_map.end());
if(*it == bs)
m_map.erase(it);
}
#endif
BOOST_ARCHIVE_DECL(const basic_serializer *)
basic_serializer_map::find(
const boost::serialization::extended_type_info & eti
) const {
const basic_serializer_arg bs(eti);
map_type::const_iterator it;
it = m_map.find(& bs);
assert(it != m_map.end());
return *it;
}
} // namespace detail
} // namespace archive
} // namespace boost