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

Subject: [Boost-commit] svn:boost r60481 - branches/release/boost/serialization
From: ramey_at_[hidden]
Date: 2010-03-11 11:31:58

Author: ramey
Date: 2010-03-11 11:31:57 EST (Thu, 11 Mar 2010)
New Revision: 60481
URL: http://svn.boost.org/trac/boost/changeset/60481

Log:
merge trunk to release
Properties modified: 
   branches/release/boost/serialization/   (props changed)
Text files modified: 
   branches/release/boost/serialization/array.hpp             |     2 --                                      
   branches/release/boost/serialization/collection_traits.hpp |    27 ++++-----------------------             
   branches/release/boost/serialization/export.hpp            |     2 +-                                      
   branches/release/boost/serialization/version.hpp           |    12 +++++++++++-                            
   4 files changed, 16 insertions(+), 27 deletions(-)

Modified: branches/release/boost/serialization/array.hpp
==============================================================================
--- branches/release/boost/serialization/array.hpp	(original)
+++ branches/release/boost/serialization/array.hpp	2010-03-11 11:31:57 EST (Thu, 11 Mar 2010)
@@ -134,8 +134,6 @@
   ar & boost::serialization::make_nvp("elems",a.elems);
 }
 
-
-
 } } // end namespace boost::serialization
 
 #ifdef __BORLANDC__

Modified: branches/release/boost/serialization/collection_traits.hpp
==============================================================================
--- branches/release/boost/serialization/collection_traits.hpp	(original)
+++ branches/release/boost/serialization/collection_traits.hpp	2010-03-11 11:31:57 EST (Thu, 11 Mar 2010)
@@ -27,6 +27,7 @@
 #include <boost/mpl/integral_c_tag.hpp>
 
 #include <boost/cstdint.hpp>
+#include <boost/integer_traits.hpp>
 #include <climits> // ULONG_MAX
 #include <boost/serialization/level.hpp>
 
@@ -47,30 +48,10 @@
     /**/
 #endif
 
-// determine if its necessary to handle (u)int64_t specifically
-// i.e. that its not a synonym for (unsigned) long
-// if there is no 64 bit int or if its the same as a long
-// we shouldn't define separate functions for int64 data types.
-#if defined(BOOST_NO_INT64_T)  
-     #define BOOST_NO_INTRINSIC_INT64_T  
-#else   
-    #if defined(ULLONG_MAX)  
-        #if(ULONG_MAX == 18446744073709551615ul) // 2**64 - 1  
-            #define BOOST_NO_INTRINSIC_INT64_T  
-        #endif  
-    #elif defined(ULONG_MAX)  
-        #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615ul) // 2**64 - 1  
-            #define BOOST_NO_INTRINSIC_INT64_T  
-        #endif  
-    #else   
-        #define BOOST_NO_INTRINSIC_INT64_T  
-    #endif  
-#endif  
-
-#if !defined(BOOST_NO_INTRINSIC_INT64_T)
+#if defined(BOOST_HAS_LONG_LONG)
     #define BOOST_SERIALIZATION_COLLECTION_TRAITS_HELPER_INT64(C)    \
-    BOOST_SERIALIZATION_COLLECTION_TRAITS_HELPER(boost::int64_t, C)  \
-    BOOST_SERIALIZATION_COLLECTION_TRAITS_HELPER(boost::uint64_t, C) \
+    BOOST_SERIALIZATION_COLLECTION_TRAITS_HELPER(boost::long_long_type, C)  \
+    BOOST_SERIALIZATION_COLLECTION_TRAITS_HELPER(boost::ulong_long_type, C) \
     /**/
 #else
     #define BOOST_SERIALIZATION_COLLECTION_TRAITS_HELPER_INT64(C)

Modified: branches/release/boost/serialization/export.hpp
==============================================================================
--- branches/release/boost/serialization/export.hpp	(original)
+++ branches/release/boost/serialization/export.hpp	2010-03-11 11:31:57 EST (Thu, 11 Mar 2010)
@@ -34,7 +34,7 @@
 #include <boost/mpl/not.hpp>
 #include <boost/mpl/bool.hpp>
 
-#include <boost/serialization/export.hpp> // for guid_defined only
+#include <boost/serialization/extended_type_info.hpp> // for guid_defined only
 #include <boost/serialization/static_warning.hpp>
 #include <boost/serialization/assume_abstract.hpp>
 #include <boost/serialization/force_include.hpp>

Modified: branches/release/boost/serialization/version.hpp
==============================================================================
--- branches/release/boost/serialization/version.hpp	(original)
+++ branches/release/boost/serialization/version.hpp	2010-03-11 11:31:57 EST (Thu, 11 Mar 2010)
@@ -23,7 +23,6 @@
 #include <boost/mpl/integral_c_tag.hpp>
 
 #include <boost/type_traits/is_base_and_derived.hpp>
-//#include <boost/serialization/traits.hpp>
 
 namespace boost { 
 namespace serialization {
@@ -67,8 +66,19 @@
 //#include <boost/serialization/level.hpp>
 //#include <boost/mpl/equal_to.hpp>
 
+#include <boost/mpl/assert.hpp>
+#include <boost/mpl/less.hpp>
+#include <boost/mpl/comparison.hpp>
+
 // specify the current version number for the class
+// version numbers limited to 8 bits !!!
 #define BOOST_CLASS_VERSION(T, N)                                      \
+BOOST_MPL_ASSERT((                                                     \
+    boost::mpl::less<                                                  \
+        boost::mpl::int_<N>,                                           \
+        boost::mpl::int_<256>                                          \
+    >                                                                  \
+));                                                                    \
 namespace boost {                                                      \
 namespace serialization {                                              \
 template<>                                                             \