[Boost-commit] svn:boost r46387 - in trunk/boost/mpi: . detail

From: troyer_at_[hidden]
Date: 2008-06-14 08:10:47

Author: troyer
Date: 2008-06-14 08:10:46 EDT (Sat, 14 Jun 2008)
New Revision: 46387
URL: http://svn.boost.org/trac/boost/changeset/46387

Log:
Adapted Boost.MPI to new array optimization in serialization
Text files modified: 
   trunk/boost/mpi/detail/content_oarchive.hpp          |     2 +-                                      
   trunk/boost/mpi/detail/forward_skeleton_oarchive.hpp |     7 +++----                                 
   trunk/boost/mpi/detail/ignore_skeleton_oarchive.hpp  |     6 +++---                                  
   trunk/boost/mpi/detail/mpi_datatype_oarchive.hpp     |     1 +                                       
   trunk/boost/mpi/detail/text_skeleton_oarchive.hpp    |     1 -                                       
   trunk/boost/mpi/packed_iarchive.hpp                  |     1 +                                       
   trunk/boost/mpi/packed_oarchive.hpp                  |     1 +                                       
   trunk/boost/mpi/skeleton_and_content.hpp             |     3 +++                                     
   8 files changed, 13 insertions(+), 9 deletions(-)

Modified: trunk/boost/mpi/detail/content_oarchive.hpp
==============================================================================
--- trunk/boost/mpi/detail/content_oarchive.hpp	(original)
+++ trunk/boost/mpi/detail/content_oarchive.hpp	2008-06-14 08:10:46 EDT (Sat, 14 Jun 2008)
@@ -61,5 +61,5 @@
 // required by export
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::mpi::detail::content_oarchive)
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::mpi::detail::ignore_skeleton_oarchive<boost::mpi::detail::content_oarchive>)
-
+BOOST_SERIALIZATION_USE_ARRAY_OPTIMIZATION(boost::mpi::detail::content_oarchive)
 #endif // BOOST_MPI_DETAIL_CONTENT_OARCHIVE_HPP

Modified: trunk/boost/mpi/detail/forward_skeleton_oarchive.hpp
==============================================================================
--- trunk/boost/mpi/detail/forward_skeleton_oarchive.hpp	(original)
+++ trunk/boost/mpi/detail/forward_skeleton_oarchive.hpp	2008-06-14 08:10:46 EDT (Sat, 14 Jun 2008)
@@ -14,22 +14,21 @@
 #include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/archive/detail/oserializer.hpp>
 #include <boost/archive/detail/interface_oarchive.hpp>
-#include <boost/archive/array/oarchive.hpp>
+#include <boost/archive/detail/common_oarchive.hpp>
 #include <boost/serialization/collection_size_type.hpp>
-#include <boost/archive/array/oarchive.hpp>
 
 namespace boost { namespace mpi { namespace detail {
 
 template<class Archive, class ImplementationArchive>
 class forward_skeleton_oarchive 
-  : public archive::array::oarchive<Archive>
+  : public archive::detail::common_oarchive<Archive>
 {
 public:
 
     typedef ImplementationArchive implementation_archive_type;
         
     forward_skeleton_oarchive(implementation_archive_type& ar) 
-	  : archive::array::oarchive<Archive>(archive::no_header),
+	  : archive::detail::common_oarchive<Archive>(archive::no_header),
                 implementation_archive(ar)
         {
         }

Modified: trunk/boost/mpi/detail/ignore_skeleton_oarchive.hpp
==============================================================================
--- trunk/boost/mpi/detail/ignore_skeleton_oarchive.hpp	(original)
+++ trunk/boost/mpi/detail/ignore_skeleton_oarchive.hpp	2008-06-14 08:10:46 EDT (Sat, 14 Jun 2008)
@@ -12,7 +12,7 @@
 #include <boost/pfto.hpp>
 
 #include <boost/archive/detail/auto_link_archive.hpp>
-#include <boost/archive/array/oarchive.hpp>
+#include <boost/archive/detail/common_oarchive.hpp>
 #include <boost/archive/basic_archive.hpp>
 #include <boost/archive/detail/oserializer.hpp>
 #include <boost/serialization/collection_size_type.hpp>
@@ -21,12 +21,12 @@
 
 template<class Archive>
 class ignore_skeleton_oarchive 
-  : public archive::array::oarchive<Archive>
+  : public archive::detail::common_oarchive<Archive>
 {
 public:
         
     ignore_skeleton_oarchive()
-	  : archive::array::oarchive<Archive>(archive::no_header)
+	  : archive::detail::common_oarchive<Archive>(archive::no_header)
         {
         }
                 

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	2008-06-14 08:10:46 EDT (Sat, 14 Jun 2008)
@@ -43,5 +43,6 @@
 // required by export
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::mpi::detail::mpi_datatype_oarchive)
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::mpi::detail::ignore_skeleton_oarchive<boost::mpi::detail::mpi_datatype_oarchive>)
+BOOST_SERIALIZATION_USE_ARRAY_OPTIMIZATION(boost::mpi::detail::mpi_datatype_oarchive)
 
 #endif // BOOST_MPI_DETAIL_MPI_DATATYPE_OARCHIVE_HPP

Modified: trunk/boost/mpi/detail/text_skeleton_oarchive.hpp
==============================================================================
--- trunk/boost/mpi/detail/text_skeleton_oarchive.hpp	(original)
+++ trunk/boost/mpi/detail/text_skeleton_oarchive.hpp	2008-06-14 08:10:46 EDT (Sat, 14 Jun 2008)
@@ -13,7 +13,6 @@
 #include <boost/archive/text_oarchive.hpp>
 #include <boost/mpi/detail/forward_skeleton_oarchive.hpp>
 #include <boost/mpi/detail/ignore_oprimitive.hpp>
-#include <boost/archive/array/oarchive.hpp>
 
 namespace boost { namespace mpi {
 

Modified: trunk/boost/mpi/packed_iarchive.hpp
==============================================================================
--- trunk/boost/mpi/packed_iarchive.hpp	(original)
+++ trunk/boost/mpi/packed_iarchive.hpp	2008-06-14 08:10:46 EDT (Sat, 14 Jun 2008)
@@ -125,5 +125,6 @@
 
 BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION(boost::mpi::packed_iarchive)
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::mpi::packed_iarchive)
+BOOST_SERIALIZATION_USE_ARRAY_OPTIMIZATION(boost::mpi::packed_iarchive)
 
 #endif // BOOST_MPI_PACKED_IARCHIVE_HPP

Modified: trunk/boost/mpi/packed_oarchive.hpp
==============================================================================
--- trunk/boost/mpi/packed_oarchive.hpp	(original)
+++ trunk/boost/mpi/packed_oarchive.hpp	2008-06-14 08:10:46 EDT (Sat, 14 Jun 2008)
@@ -113,6 +113,7 @@
 
 // required by export
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::mpi::packed_oarchive)
+BOOST_SERIALIZATION_USE_ARRAY_OPTIMIZATION(boost::mpi::packed_oarchive)
 
 
 

Modified: trunk/boost/mpi/skeleton_and_content.hpp
==============================================================================
--- trunk/boost/mpi/skeleton_and_content.hpp	(original)
+++ trunk/boost/mpi/skeleton_and_content.hpp	2008-06-14 08:10:46 EDT (Sat, 14 Jun 2008)
@@ -385,4 +385,7 @@
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::mpi::detail::type1)
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::mpi::detail::type2)
 
+BOOST_SERIALIZATION_USE_ARRAY_OPTIMIZATION(boost::mpi::packed_skeleton_oarchive)
+BOOST_SERIALIZATION_USE_ARRAY_OPTIMIZATION(boost::mpi::packed_skeleton_iarchive)
+
 #endif // BOOST_MPI_SKELETON_AND_CONTENT_HPP