|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r55139 - in trunk: boost/mpi/detail libs/mpi/src
From: troyer_at_[hidden]
Date: 2009-07-23 19:19:17
Author: troyer
Date: 2009-07-23 19:19:16 EDT (Thu, 23 Jul 2009)
New Revision: 55139
URL: http://svn.boost.org/trac/boost/changeset/55139
Log:
Made Boost.MPI work with the new pointer serialization
Text files modified:
trunk/boost/mpi/detail/mpi_datatype_oarchive.hpp | 1 +
trunk/libs/mpi/src/content_oarchive.cpp | 9 +++++----
trunk/libs/mpi/src/mpi_datatype_cache.cpp | 2 +-
trunk/libs/mpi/src/mpi_datatype_oarchive.cpp | 5 +++--
trunk/libs/mpi/src/packed_iarchive.cpp | 7 +++----
trunk/libs/mpi/src/packed_oarchive.cpp | 6 +++---
trunk/libs/mpi/src/packed_skeleton_iarchive.cpp | 9 ++++++---
trunk/libs/mpi/src/packed_skeleton_oarchive.cpp | 7 ++++---
trunk/libs/mpi/src/text_skeleton_oarchive.cpp | 5 +++--
9 files changed, 29 insertions(+), 22 deletions(-)
Modified: trunk/boost/mpi/detail/mpi_datatype_oarchive.hpp
==============================================================================
--- trunk/boost/mpi/detail/mpi_datatype_oarchive.hpp (original)
+++ trunk/boost/mpi/detail/mpi_datatype_oarchive.hpp 2009-07-23 19:19:16 EDT (Thu, 23 Jul 2009)
@@ -16,6 +16,7 @@
#include <boost/mpi/detail/mpi_datatype_primitive.hpp>
#include <boost/mpi/datatype_fwd.hpp>
#include <boost/mpl/assert.hpp>
+#include <boost/archive/detail/register_archive.hpp>
namespace boost { namespace mpi { namespace detail {
Modified: trunk/libs/mpi/src/content_oarchive.cpp
==============================================================================
--- trunk/libs/mpi/src/content_oarchive.cpp (original)
+++ trunk/libs/mpi/src/content_oarchive.cpp 2009-07-23 19:19:16 EDT (Thu, 23 Jul 2009)
@@ -7,13 +7,14 @@
// Authors: Matthias Troyer
#define BOOST_ARCHIVE_SOURCE
-#include <boost/archive/impl/archive_pointer_oserializer.ipp>
+#include <boost/archive/detail/archive_serializer_map.hpp>
+#include <boost/archive/impl/archive_serializer_map.ipp>
#include <boost/mpi/skeleton_and_content.hpp>
namespace boost { namespace archive { namespace detail {
// explicitly instantiate all required template functions
-template class archive_pointer_oserializer<mpi::detail::content_oarchive> ;
-template class archive_pointer_oserializer<boost::mpi::detail::ignore_skeleton_oarchive<boost::mpi::detail::content_oarchive> >;
-template class archive_pointer_oserializer<boost::mpi::detail::ignore_skeleton_oarchive<boost::mpi::detail::mpi_datatype_oarchive> >;
+template class archive_serializer_map<mpi::detail::content_oarchive> ;
+template class archive_serializer_map<boost::mpi::detail::ignore_skeleton_oarchive<boost::mpi::detail::content_oarchive> >;
+template class archive_serializer_map<boost::mpi::detail::ignore_skeleton_oarchive<boost::mpi::detail::mpi_datatype_oarchive> >;
} } }
Modified: trunk/libs/mpi/src/mpi_datatype_cache.cpp
==============================================================================
--- trunk/libs/mpi/src/mpi_datatype_cache.cpp (original)
+++ trunk/libs/mpi/src/mpi_datatype_cache.cpp 2009-07-23 19:19:16 EDT (Thu, 23 Jul 2009)
@@ -6,7 +6,7 @@
// Authors: Matthias Troyer
-#include <boost/archive/impl/archive_pointer_oserializer.ipp>
+#include <boost/archive/detail/archive_serializer_map.hpp>
#include <boost/mpi/detail/mpi_datatype_cache.hpp>
#include <map>
Modified: trunk/libs/mpi/src/mpi_datatype_oarchive.cpp
==============================================================================
--- trunk/libs/mpi/src/mpi_datatype_oarchive.cpp (original)
+++ trunk/libs/mpi/src/mpi_datatype_oarchive.cpp 2009-07-23 19:19:16 EDT (Thu, 23 Jul 2009)
@@ -7,12 +7,13 @@
// Authors: Matthias Troyer
#define BOOST_ARCHIVE_SOURCE
-#include <boost/archive/impl/archive_pointer_oserializer.ipp>
+#include <boost/archive/detail/archive_serializer_map.hpp>
+#include <boost/archive/impl/archive_serializer_map.ipp>
#include <boost/mpi/detail/mpi_datatype_oarchive.hpp>
namespace boost { namespace archive { namespace detail {
// explicitly instantiate all required template functions
-template class archive_pointer_oserializer<mpi::detail::mpi_datatype_oarchive> ;
+template class archive_serializer_map<mpi::detail::mpi_datatype_oarchive> ;
} } }
Modified: trunk/libs/mpi/src/packed_iarchive.cpp
==============================================================================
--- trunk/libs/mpi/src/packed_iarchive.cpp (original)
+++ trunk/libs/mpi/src/packed_iarchive.cpp 2009-07-23 19:19:16 EDT (Thu, 23 Jul 2009)
@@ -7,10 +7,10 @@
// Authors: Matthias Troyer
#define BOOST_ARCHIVE_SOURCE
-#include <boost/archive/impl/archive_pointer_iserializer.ipp>
-#include <boost/archive/impl/archive_pointer_oserializer.ipp>
#include <boost/mpi/packed_iarchive.hpp>
+#include <boost/archive/detail/archive_serializer_map.hpp>
+#include <boost/archive/impl/archive_serializer_map.ipp>
#include <boost/archive/binary_iarchive.hpp>
#include <boost/archive/impl/basic_binary_iprimitive.ipp>
#include <boost/archive/impl/basic_binary_iarchive.ipp>
@@ -20,7 +20,6 @@
// explicitly instantiate all required templates
template class basic_binary_iarchive<mpi::packed_iarchive> ;
-template class detail::archive_pointer_iserializer<mpi::packed_iarchive> ;
-//template class binary_iarchive_impl<mpi_packed_iarchive> ;
+template class detail::archive_serializer_map<mpi::packed_iarchive> ;
} } // end namespace boost::archive
Modified: trunk/libs/mpi/src/packed_oarchive.cpp
==============================================================================
--- trunk/libs/mpi/src/packed_oarchive.cpp (original)
+++ trunk/libs/mpi/src/packed_oarchive.cpp 2009-07-23 19:19:16 EDT (Thu, 23 Jul 2009)
@@ -9,16 +9,16 @@
#define BOOST_ARCHIVE_SOURCE
#include <boost/mpi/packed_oarchive.hpp>
+#include <boost/archive/detail/archive_serializer_map.hpp>
+#include <boost/archive/impl/archive_serializer_map.ipp>
#include <boost/archive/binary_oarchive.hpp>
#include <boost/archive/impl/basic_binary_oprimitive.ipp>
#include <boost/archive/impl/basic_binary_oarchive.ipp>
-#include <boost/archive/impl/archive_pointer_oserializer.ipp>
namespace boost { namespace archive {
// explicitly instantiate all required templates
-template class detail::archive_pointer_oserializer<mpi::packed_oarchive> ;
+template class detail::archive_serializer_map<mpi::packed_oarchive> ;
template class basic_binary_oarchive<mpi::packed_oarchive> ;
-//template class binary_oarchive_impl<mpi_packed_oarchive> ;
} } // end namespace boost::archive
Modified: trunk/libs/mpi/src/packed_skeleton_iarchive.cpp
==============================================================================
--- trunk/libs/mpi/src/packed_skeleton_iarchive.cpp (original)
+++ trunk/libs/mpi/src/packed_skeleton_iarchive.cpp 2009-07-23 19:19:16 EDT (Thu, 23 Jul 2009)
@@ -7,7 +7,10 @@
// Authors: Matthias Troyer
#define BOOST_ARCHIVE_SOURCE
-#include <boost/archive/impl/archive_pointer_iserializer.ipp>
+
+#include <boost/archive/detail/archive_serializer_map.hpp>
+#include <boost/archive/impl/archive_serializer_map.ipp>
+
#include <boost/mpi/skeleton_and_content.hpp>
#include <boost/archive/binary_iarchive.hpp>
@@ -19,8 +22,8 @@
// explicitly instantiate all required templates
template class basic_binary_iarchive<mpi::packed_skeleton_iarchive> ;
-template class detail::archive_pointer_iserializer<mpi::packed_skeleton_iarchive> ;
-template class detail::archive_pointer_iserializer<
+template class detail::archive_serializer_map<mpi::packed_skeleton_iarchive> ;
+template class detail::archive_serializer_map<
mpi::detail::forward_skeleton_iarchive<
boost::mpi::packed_skeleton_iarchive, boost::mpi::packed_iarchive> > ;
//template class binary_iarchive_impl<packed_skeleton_iarchive> ;
Modified: trunk/libs/mpi/src/packed_skeleton_oarchive.cpp
==============================================================================
--- trunk/libs/mpi/src/packed_skeleton_oarchive.cpp (original)
+++ trunk/libs/mpi/src/packed_skeleton_oarchive.cpp 2009-07-23 19:19:16 EDT (Thu, 23 Jul 2009)
@@ -9,16 +9,17 @@
#define BOOST_ARCHIVE_SOURCE
#include <boost/mpi/skeleton_and_content.hpp>
+#include <boost/archive/detail/archive_serializer_map.hpp>
+#include <boost/archive/impl/archive_serializer_map.ipp>
#include <boost/archive/binary_oarchive.hpp>
#include <boost/archive/impl/basic_binary_oprimitive.ipp>
#include <boost/archive/impl/basic_binary_oarchive.ipp>
-#include <boost/archive/impl/archive_pointer_oserializer.ipp>
namespace boost { namespace archive {
// explicitly instantiate all required templates
-template class detail::archive_pointer_oserializer<mpi::packed_skeleton_oarchive> ;
-template class detail::archive_pointer_oserializer<
+template class detail::archive_serializer_map<mpi::packed_skeleton_oarchive> ;
+template class detail::archive_serializer_map<
mpi::detail::forward_skeleton_oarchive<
boost::mpi::packed_skeleton_oarchive, boost::mpi::packed_oarchive> > ;
template class basic_binary_oarchive<mpi::packed_skeleton_oarchive> ;
Modified: trunk/libs/mpi/src/text_skeleton_oarchive.cpp
==============================================================================
--- trunk/libs/mpi/src/text_skeleton_oarchive.cpp (original)
+++ trunk/libs/mpi/src/text_skeleton_oarchive.cpp 2009-07-23 19:19:16 EDT (Thu, 23 Jul 2009)
@@ -9,14 +9,15 @@
#define BOOST_ARCHIVE_SOURCE
#include <boost/mpi/detail/text_skeleton_oarchive.hpp>
+#include <boost/archive/detail/archive_serializer_map.hpp>
+#include <boost/archive/impl/archive_serializer_map.ipp>
#include <boost/archive/binary_oarchive.hpp>
#include <boost/archive/impl/basic_binary_oprimitive.ipp>
#include <boost/archive/impl/basic_binary_oarchive.ipp>
-#include <boost/archive/impl/archive_pointer_oserializer.ipp>
namespace boost { namespace archive {
// explicitly instantiate all required templates
-template class detail::archive_pointer_oserializer<mpi::text_skeleton_oarchive> ;
+template class detail::archive_serializer_map<text_oarchive>;
} } // end namespace boost::archive
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk