Moved Serialization and MPI fixes and updates from trunk to release branch

[SVN r46743]
This commit is contained in:
Matthias Troyer
2008-06-26 19:25:44 +00:00
parent d3c464b892
commit a980481e7c
395 changed files with 17039 additions and 24410 deletions

View File

@@ -14,8 +14,6 @@
#include <stdlib.h> // for NULL
#include <set>
#define BOOST_ARCHIVE_SOURCE
#include <boost/archive/detail/basic_serializer.hpp>
#include <boost/archive/detail/basic_serializer_map.hpp>
@@ -27,6 +25,7 @@ namespace boost {
namespace archive {
namespace detail {
#if 0
BOOST_ARCHIVE_DECL(bool)
type_info_pointer_compare::operator()(
const basic_serializer * lhs, const basic_serializer * rhs
@@ -34,6 +33,19 @@ type_info_pointer_compare::operator()(
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)
@@ -41,6 +53,19 @@ basic_serializer_map::basic_serializer_map(bool & 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;
@@ -48,33 +73,13 @@ basic_serializer_map::~basic_serializer_map(){
BOOST_ARCHIVE_DECL(bool)
basic_serializer_map::insert(const basic_serializer * bs){
return m_map.insert(bs).second;
boost::serialization::singleton<basic_serializer_map>::lease l;
return l->m_map.insert(bs).second;
}
BOOST_ARCHIVE_DECL(void)
basic_serializer_map::erase(basic_serializer * bs){
m_map.erase(bs);
boost::serialization::singleton<basic_serializer_map>::lease l;
l->m_map.erase(bs);
}
class basic_serializer_arg : public basic_serializer {
public:
basic_serializer_arg(const serialization::extended_type_info & eti) :
basic_serializer(eti)
{}
};
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;
it = m_map.find(& bs);
if(it == m_map.end())
return NULL;
return *it;
}
} // namespace detail
} // namespace archive
} // namespace boost
#endif