[Boost-commit] svn:boost r68302 - branches/release/boost/serialization

Subject: [Boost-commit] svn:boost r68302 - branches/release/boost/serialization
From: ramey_at_[hidden]
Date: 2011-01-19 12:39:49

Author: ramey
Date: 2011-01-19 12:39:47 EST (Wed, 19 Jan 2011)
New Revision: 68302
URL: http://svn.boost.org/trac/boost/changeset/68302

Log:
merge trunk into 1.46 release
Properties modified: 
   branches/release/boost/serialization/   (props changed)
Text files modified: 
   branches/release/boost/serialization/binary_object.hpp              |     2 +-                                      
   branches/release/boost/serialization/collections_load_imp.hpp       |     2 +-                                      
   branches/release/boost/serialization/extended_type_info.hpp         |     2 +-                                      
   branches/release/boost/serialization/extended_type_info_no_rtti.hpp |     6 +++---                                  
   branches/release/boost/serialization/extended_type_info_typeid.hpp  |     4 ++--                                    
   branches/release/boost/serialization/factory.hpp                    |     2 +-                                      
   branches/release/boost/serialization/item_version_type.hpp          |     4 ++--                                    
   branches/release/boost/serialization/singleton.hpp                  |     6 +++---                                  
   8 files changed, 14 insertions(+), 14 deletions(-)

Modified: branches/release/boost/serialization/binary_object.hpp
==============================================================================
--- branches/release/boost/serialization/binary_object.hpp	(original)
+++ branches/release/boost/serialization/binary_object.hpp	2011-01-19 12:39:47 EST (Wed, 19 Jan 2011)
@@ -16,7 +16,7 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
-#include <cassert>
+#include <boost/assert.hpp>
 
 #include <cstddef> // std::size_t
 #include <boost/config.hpp>

Modified: branches/release/boost/serialization/collections_load_imp.hpp
==============================================================================
--- branches/release/boost/serialization/collections_load_imp.hpp	(original)
+++ branches/release/boost/serialization/collections_load_imp.hpp	2011-01-19 12:39:47 EST (Wed, 19 Jan 2011)
@@ -22,7 +22,7 @@
 
 // helper function templates for serialization of collections
 
-#include <cassert>
+#include <boost/assert.hpp>
 #include <cstddef> // size_t
 #include <boost/config.hpp> // msvc 6.0 needs this for warning suppression
 #if defined(BOOST_NO_STDC_NAMESPACE)

Modified: branches/release/boost/serialization/extended_type_info.hpp
==============================================================================
--- branches/release/boost/serialization/extended_type_info.hpp	(original)
+++ branches/release/boost/serialization/extended_type_info.hpp	2011-01-19 12:39:47 EST (Wed, 19 Jan 2011)
@@ -19,7 +19,7 @@
 // for now, extended type info is part of the serialization libraries
 // this could change in the future.
 #include <cstdarg>
-#include <cassert>
+#include <boost/assert.hpp>
 #include <cstddef> // NULL
 #include <boost/config.hpp>
 #include <boost/noncopyable.hpp>

Modified: branches/release/boost/serialization/extended_type_info_no_rtti.hpp
==============================================================================
--- branches/release/boost/serialization/extended_type_info_no_rtti.hpp	(original)
+++ branches/release/boost/serialization/extended_type_info_no_rtti.hpp	2011-01-19 12:39:47 EST (Wed, 19 Jan 2011)
@@ -17,7 +17,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 //  See http://www.boost.org for updates, documentation, and revision history.
-#include <cassert>
+#include <boost/assert.hpp>
 
 #include <boost/config.hpp>
 #include <boost/static_assert.hpp>
@@ -115,7 +115,7 @@
         // function. So if the is not a polymporphic type it's likely an error
         BOOST_STATIC_WARNING(boost::is_polymorphic< T >::value);
         const char * derived_key = t.get_key();
-        assert(NULL != derived_key);
+        BOOST_ASSERT(NULL != derived_key);
         return boost::serialization::extended_type_info::find(derived_key);
     }
     const char * get_key() const{
@@ -140,7 +140,7 @@
         case 4:
             return factory<BOOST_DEDUCED_TYPENAME boost::remove_const< T >::type, 4>(ap);
         default:
-            assert(false); // too many arguments
+            BOOST_ASSERT(false); // too many arguments
             // throw exception here?
             return NULL;
         }

Modified: branches/release/boost/serialization/extended_type_info_typeid.hpp
==============================================================================
--- branches/release/boost/serialization/extended_type_info_typeid.hpp	(original)
+++ branches/release/boost/serialization/extended_type_info_typeid.hpp	2011-01-19 12:39:47 EST (Wed, 19 Jan 2011)
@@ -20,7 +20,7 @@
 
 #include <typeinfo>
 #include <cstdarg>
-#include <cassert>
+#include <boost/assert.hpp>
 #include <boost/config.hpp>
 
 #include <boost/static_assert.hpp>
@@ -124,7 +124,7 @@
         case 4:
             return factory<BOOST_DEDUCED_TYPENAME boost::remove_const< T >::type, 4>(ap);
         default:
-            assert(false); // too many arguments
+            BOOST_ASSERT(false); // too many arguments
             // throw exception here?
             return NULL;
         }

Modified: branches/release/boost/serialization/factory.hpp
==============================================================================
--- branches/release/boost/serialization/factory.hpp	(original)
+++ branches/release/boost/serialization/factory.hpp	2011-01-19 12:39:47 EST (Wed, 19 Jan 2011)
@@ -35,7 +35,7 @@
 // default implementation does nothing.
 template<class T, int N>
 T * factory(std::va_list){
-    assert(false);
+    BOOST_ASSERT(false);
     // throw exception here?
     return NULL;
 }

Modified: branches/release/boost/serialization/item_version_type.hpp
==============================================================================
--- branches/release/boost/serialization/item_version_type.hpp	(original)
+++ branches/release/boost/serialization/item_version_type.hpp	2011-01-19 12:39:47 EST (Wed, 19 Jan 2011)
@@ -12,7 +12,7 @@
 #include <boost/serialization/is_bitwise_serializable.hpp>
 
 // fixes broken example build on x86_64-linux-gnu-gcc-4.6.0
-#include <cassert>
+#include <boost/assert.hpp>
 
 namespace boost { 
 namespace serialization {
@@ -30,7 +30,7 @@
     // should be private - but MPI fails if it's not!!!
     item_version_type(): t(0) {};
     explicit item_version_type(const unsigned int t_) : t(t_){
-        assert(t_ <= boost::integer_traits<base_type>::const_max);
+        BOOST_ASSERT(t_ <= boost::integer_traits<base_type>::const_max);
     }
     item_version_type(const item_version_type & t_) : 
         t(t_.t)

Modified: branches/release/boost/serialization/singleton.hpp
==============================================================================
--- branches/release/boost/serialization/singleton.hpp	(original)
+++ branches/release/boost/serialization/singleton.hpp	2011-01-19 12:39:47 EST (Wed, 19 Jan 2011)
@@ -34,7 +34,7 @@
 # pragma once
 #endif 
 
-#include <cassert>
+#include <boost/assert.hpp>
 #include <boost/config.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/serialization/force_include.hpp>
@@ -128,13 +128,13 @@
         static detail::singleton_wrapper< T > t;
         // refer to instance, causing it to be instantiated (and
         // initialized at startup on working compilers)
-        assert(! detail::singleton_wrapper< T >::m_is_destroyed);
+        BOOST_ASSERT(! detail::singleton_wrapper< T >::m_is_destroyed);
         use(instance);
         return static_cast<T &>(t);
     }
 public:
     BOOST_DLLEXPORT static T & get_mutable_instance(){
-        assert(! is_locked());
+        BOOST_ASSERT(! is_locked());
         return get_instance();
     }
     BOOST_DLLEXPORT static const T & get_const_instance(){