[Boost-commit] svn:boost r64960 - trunk/boost/serialization

Subject: [Boost-commit] svn:boost r64960 - trunk/boost/serialization
From: ramey_at_[hidden]
Date: 2010-08-22 21:21:45

Author: ramey
Date: 2010-08-22 21:21:35 EDT (Sun, 22 Aug 2010)
New Revision: 64960
URL: http://svn.boost.org/trac/boost/changeset/64960

Log:
reverse overzealous fix for basic_archive checkin
Text files modified: 
   trunk/boost/serialization/serialization.hpp |    12 +++++++++---                            
   trunk/boost/serialization/split_free.hpp    |     6 ++++--                                  
   2 files changed, 13 insertions(+), 5 deletions(-)

Modified: trunk/boost/serialization/serialization.hpp
==============================================================================
--- trunk/boost/serialization/serialization.hpp	(original)
+++ trunk/boost/serialization/serialization.hpp	2010-08-22 21:21:35 EDT (Sun, 22 Aug 2010)
@@ -11,6 +11,7 @@
 #endif
 
 #include <boost/config.hpp>
+#include <boost/serialization/strong_typedef.hpp>
 #include <boost/serialization/pfto.hpp>
 
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
@@ -58,6 +59,8 @@
 namespace boost {
 namespace serialization {
 
+BOOST_STRONG_TYPEDEF(unsigned int, version_type)
+
 // default implementation - call the member function "serialize"
 template<class Archive, class T>
 inline void serialize(
@@ -121,7 +124,8 @@
     // PFTO, suppress it here.  As far as we know, there are no compilers
     // which fail to support PFTO while supporting two-phase lookup.
     #if ! defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
-        serialize(ar, t, file_version);
+        const version_type v(file_version);
+        serialize(ar, t, v);
     #else
         serialize(ar, t, file_version);
     #endif
@@ -135,7 +139,8 @@
 ){
     // see above
     #if ! defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
-        save_construct_data(ar, t, file_version);
+        const version_type v(file_version);
+        save_construct_data(ar, t, v);
     #else
         save_construct_data(ar, t, file_version);
     #endif
@@ -149,7 +154,8 @@
 ){
     // see above comment
     #if ! defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
-        load_construct_data(ar, t, file_version);
+        const version_type v(file_version);
+        load_construct_data(ar, t, v);
     #else
         load_construct_data(ar, t, file_version);
     #endif

Modified: trunk/boost/serialization/split_free.hpp
==============================================================================
--- trunk/boost/serialization/split_free.hpp	(original)
+++ trunk/boost/serialization/split_free.hpp	2010-08-22 21:21:35 EDT (Sun, 22 Aug 2010)
@@ -41,7 +41,8 @@
     ){
         // use function overload (version_type) to workaround
         // two-phase lookup issue
-        save(ar, t, file_version);
+        const version_type v(file_version);
+        save(ar, t, v);
     }
 };
 template<class Archive, class T>
@@ -53,7 +54,8 @@
     ){
         // use function overload (version_type) to workaround
         // two-phase lookup issue
-        load(ar, t, file_version);
+        const version_type v(file_version);
+        load(ar, t, v);
     }
 };
 //} // namespace detail