[Boost-commit] svn:boost r66420 - branches/release/libs/serialization/src

Subject: [Boost-commit] svn:boost r66420 - branches/release/libs/serialization/src
From: ramey_at_[hidden]
Date: 2010-11-06 16:00:53

Author: ramey
Date: 2010-11-06 16:00:50 EDT (Sat, 06 Nov 2010)
New Revision: 66420
URL: http://svn.boost.org/trac/boost/changeset/66420

Log:
merge to release branch
Properties modified: 
   branches/release/libs/serialization/src/   (props changed)
Text files modified: 
   branches/release/libs/serialization/src/basic_archive.cpp         |    16 +++++++++++++---                        
   branches/release/libs/serialization/src/basic_iarchive.cpp        |     3 +++                                     
   branches/release/libs/serialization/src/basic_oarchive.cpp        |     3 +++                                     
   branches/release/libs/serialization/src/basic_serializer_map.cpp  |     4 ++++                                    
   branches/release/libs/serialization/src/shared_ptr_helper.cpp     |     3 +++                                     
   branches/release/libs/serialization/src/void_cast.cpp             |     3 ++-                                     
   branches/release/libs/serialization/src/xml_archive_exception.cpp |     2 +-                                      
   7 files changed, 29 insertions(+), 5 deletions(-)

Modified: branches/release/libs/serialization/src/basic_archive.cpp
==============================================================================
--- branches/release/libs/serialization/src/basic_archive.cpp	(original)
+++ branches/release/libs/serialization/src/basic_archive.cpp	2010-11-06 16:00:50 EDT (Sat, 06 Nov 2010)
@@ -57,13 +57,23 @@
 // 5 - Boost 1.36
 //     changed serialization of collections: adding version even for primitive
 //     types caused backwards compatibility breaking change in 1.35
-// 6 - Boost 1.41, serializing collection sizes as std::size_t
-// 7 - separated version_type into library_version_type and class_version_type
+// 6 - Boost 1.41 17 Nov 200
+//     serializing collection sizes as std::size_t
+// 7   Boost 1.42 2 Feb 2010
+//     error - changed binary version to 16 bits w/o changing library version #
+//     That is - binary archives are recorded with #6 even though they are
+//     different from the previous versions.  This means that binary archives
+//     created with versions 1.42 and 1.43 will have to be fixed with a special
+//     program which fixes the library version # in the header
+//     Boost 1.43 6 May 2010
+//     no change
+// 8 - Boost 1.44
+//     separated version_type into library_version_type and class_version_type
 //     changed version_type to be stored as 8 bits.
 
 BOOST_ARCHIVE_DECL(library_version_type)
 BOOST_ARCHIVE_VERSION(){
-    return library_version_type(7);
+    return library_version_type(8);
 }
 
 } // namespace archive

Modified: branches/release/libs/serialization/src/basic_iarchive.cpp
==============================================================================
--- branches/release/libs/serialization/src/basic_iarchive.cpp	(original)
+++ branches/release/libs/serialization/src/basic_iarchive.cpp	2010-11-06 16:00:50 EDT (Sat, 06 Nov 2010)
@@ -29,6 +29,9 @@
 #include <boost/serialization/tracking.hpp>
 
 #define BOOST_ARCHIVE_SOURCE
+// include this to prevent linker errors when the
+// same modules are marked export and import.
+#define BOOST_SERIALIZATION_SOURCE
 
 #include <boost/archive/archive_exception.hpp>
 

Modified: branches/release/libs/serialization/src/basic_oarchive.cpp
==============================================================================
--- branches/release/libs/serialization/src/basic_oarchive.cpp	(original)
+++ branches/release/libs/serialization/src/basic_oarchive.cpp	2010-11-06 16:00:50 EDT (Sat, 06 Nov 2010)
@@ -21,6 +21,9 @@
 // including this here to work around an ICC in intel 7.0
 // normally this would be part of basic_oarchive.hpp below.
 #define BOOST_ARCHIVE_SOURCE
+// include this to prevent linker errors when the
+// same modules are marked export and import.
+#define BOOST_SERIALIZATION_SOURCE
 
 #include <boost/archive/detail/decl.hpp>
 #include <boost/archive/basic_archive.hpp>

Modified: branches/release/libs/serialization/src/basic_serializer_map.cpp
==============================================================================
--- branches/release/libs/serialization/src/basic_serializer_map.cpp	(original)
+++ branches/release/libs/serialization/src/basic_serializer_map.cpp	2010-11-06 16:00:50 EDT (Sat, 06 Nov 2010)
@@ -16,6 +16,10 @@
 #include <utility>
 
 #define BOOST_ARCHIVE_SOURCE
+// include this to prevent linker errors when the
+// same modules are marked export and import.
+#define BOOST_SERIALIZATION_SOURCE
+
 #include <boost/archive/archive_exception.hpp>
 #include <boost/serialization/throw_exception.hpp>
 

Modified: branches/release/libs/serialization/src/shared_ptr_helper.cpp
==============================================================================
--- branches/release/libs/serialization/src/shared_ptr_helper.cpp	(original)
+++ branches/release/libs/serialization/src/shared_ptr_helper.cpp	2010-11-06 16:00:50 EDT (Sat, 06 Nov 2010)
@@ -19,6 +19,9 @@
 #include <cstddef> // NULL
 
 #define BOOST_ARCHIVE_SOURCE
+// include this to prevent linker errors when the
+// same modules are marked export and import.
+#define BOOST_SERIALIZATION_SOURCE
 
 #include <boost/serialization/throw_exception.hpp>
 #include <boost/serialization/void_cast.hpp>

Modified: branches/release/libs/serialization/src/void_cast.cpp
==============================================================================
--- branches/release/libs/serialization/src/void_cast.cpp	(original)
+++ branches/release/libs/serialization/src/void_cast.cpp	2010-11-06 16:00:50 EDT (Sat, 06 Nov 2010)
@@ -226,8 +226,9 @@
     #endif
 
     std::pair<void_cast_detail::set_type::const_iterator, bool> result;
+    // comment this out for now.  
     result = s.insert(this);
-    assert(result.second);
+    //assert(result.second);
 
     // generate all implied void_casts.
     void_cast_detail::set_type::const_iterator it;

Modified: branches/release/libs/serialization/src/xml_archive_exception.cpp
==============================================================================
--- branches/release/libs/serialization/src/xml_archive_exception.cpp	(original)
+++ branches/release/libs/serialization/src/xml_archive_exception.cpp	2010-11-06 16:00:50 EDT (Sat, 06 Nov 2010)
@@ -12,12 +12,12 @@
 #  pragma warning (disable : 4786) // too long name, harmless warning
 #endif
 
-#define BOOST_ARCHIVE_SOURCE
 
 #include <exception>
 #include <cassert>
 #include <string>
 
+#define BOOST_ARCHIVE_SOURCE
 #include <boost/archive/xml_archive_exception.hpp>
 
 namespace boost {