[Boost-commit] svn:boost r43096 - branches/release/boost/archive/array

From: troyer_at_[hidden]
Date: 2008-02-04 11:47:31

Author: troyer
Date: 2008-02-04 11:47:31 EST (Mon, 04 Feb 2008)
New Revision: 43096
URL: http://svn.boost.org/trac/boost/changeset/43096

Log:
Removed an optimization overload that caused issues with tracking. A fixed optimization overload will be delayed to 1.36
Text files modified: 
   branches/release/boost/archive/array/iarchive.hpp |    46 ++++++++++++++++++++--------------------
   branches/release/boost/archive/array/oarchive.hpp |    42 ++++++++++++++++++------------------    
   2 files changed, 44 insertions(+), 44 deletions(-)

Modified: branches/release/boost/archive/array/iarchive.hpp
==============================================================================
--- branches/release/boost/archive/array/iarchive.hpp	(original)
+++ branches/release/boost/archive/array/iarchive.hpp	2008-02-04 11:47:31 EST (Mon, 04 Feb 2008)
@@ -65,18 +65,18 @@
   }
 
   // the optimized implementation for vector uses serialization::array
-  template<class U, class Allocator>
-  void load_optimized(
-    std::vector<U, Allocator> &t, unsigned int version, mpl::true_)
-  {
-    t.clear();
-    // retrieve number of elements
-    serialization::collection_size_type count;
-    *this->This() >> BOOST_SERIALIZATION_NVP(count);
-    t.resize(count);
-    if (!t.empty())
-      * this->This() >> serialization::make_array(serialization::detail::get_data(t),t.size());
-  }
+//  template<class U, class Allocator>
+//  void load_optimized(
+//    std::vector<U, Allocator> &t, unsigned int version, mpl::true_)
+//  {
+//    t.clear();
+//    // retrieve number of elements
+//    serialization::collection_size_type count;
+//    *this->This() >> BOOST_SERIALIZATION_NVP(count);
+//    t.resize(count);
+//    if (!t.empty())
+//      * this->This() >> serialization::make_array(serialization::detail::get_data(t),t.size());
+//  }
 
   // the optimized implementation for serialization::array uses save_array
   template<class ValueType>
@@ -91,17 +91,17 @@
   // if the value type is trivially constructable or an optimized array save exists, 
   // then we can use the optimized version
 
-  template<class ValueType, class Allocator>
-  void load_override(std::vector<ValueType,Allocator> &x, unsigned int version)
-  {
-    typedef typename mpl::and_<
-      mpl::not_<is_same<ValueType,bool> >,
-      mpl::apply1<
-        BOOST_DEDUCED_TYPENAME Archive::use_array_optimization
-      , ValueType>
-    >::type use_optimized;
-    load_optimized(x,version, use_optimized() );   
-  }
+//  template<class ValueType, class Allocator>
+//  void load_override(std::vector<ValueType,Allocator> &x, unsigned int version)
+//  {
+//    typedef typename mpl::and_<
+//      mpl::not_<is_same<ValueType,bool> >,
+//      mpl::apply1<
+//        BOOST_DEDUCED_TYPENAME Archive::use_array_optimization
+//      , ValueType>
+//    >::type use_optimized;
+//    load_optimized(x,version, use_optimized() );   
+//  }
   
   
   // dispatch loading of arrays to the optimized version where supported

Modified: branches/release/boost/archive/array/oarchive.hpp
==============================================================================
--- branches/release/boost/archive/array/oarchive.hpp	(original)
+++ branches/release/boost/archive/array/oarchive.hpp	2008-02-04 11:47:31 EST (Mon, 04 Feb 2008)
@@ -65,15 +65,15 @@
 
 
   // the optimized implementation for vector uses serialization::array
-  template<class ValueType, class Allocator>
-  void save_optimized(
-    const std::vector<ValueType, Allocator> &t, unsigned int, mpl::true_)
-  {
-    const serialization::collection_size_type count(t.size());
-    * this->This() << BOOST_SERIALIZATION_NVP(count);
-    if (!t.empty())
-      * this->This() << serialization::make_array(serialization::detail::get_data(t),t.size());
-  }
+//  template<class ValueType, class Allocator>
+//  void save_optimized(
+//    const std::vector<ValueType, Allocator> &t, unsigned int, mpl::true_)
+//  {
+//    const serialization::collection_size_type count(t.size());
+//    * this->This() << BOOST_SERIALIZATION_NVP(count);
+//    if (!t.empty())
+//      * this->This() << serialization::make_array(serialization::detail::get_data(t),t.size());
+//  }
 
   // the optimized implementation for serialization::array uses save_array
   template<class ValueType>
@@ -88,18 +88,18 @@
   // if the value type is trivially constructable or an optimized array save exists, 
   // then we can use the optimized version
 
-  template<class ValueType, class Allocator>
-  void save_override(std::vector<ValueType,Allocator> const &x, unsigned int version)
-  {
-    typedef BOOST_DEDUCED_TYPENAME remove_const<ValueType>::type value_type;
-    typedef typename mpl::and_<
-      mpl::not_<is_same<value_type,bool> >,
-      mpl::apply1<
-        BOOST_DEDUCED_TYPENAME Archive::use_array_optimization
-      , value_type>
-    >::type use_optimized;
-    save_optimized(x,version,use_optimized() );   
-  }
+//  template<class ValueType, class Allocator>
+//  void save_override(std::vector<ValueType,Allocator> const &x, unsigned int version)
+//  {
+//    typedef BOOST_DEDUCED_TYPENAME remove_const<ValueType>::type value_type;
+//    typedef typename mpl::and_<
+//      mpl::not_<is_same<value_type,bool> >,
+//      mpl::apply1<
+//        BOOST_DEDUCED_TYPENAME Archive::use_array_optimization
+//      , value_type>
+//    >::type use_optimized;
+//    save_optimized(x,version,use_optimized() );   
+//  }