[Boost-commit] svn:boost r71427 - in branches/release/boost: archive serialization

Subject: [Boost-commit] svn:boost r71427 - in branches/release/boost: archive serialization
From: ramey_at_[hidden]
Date: 2011-04-22 19:43:19

Author: ramey
Date: 2011-04-22 19:43:18 EDT (Fri, 22 Apr 2011)
New Revision: 71427
URL: http://svn.boost.org/trac/boost/changeset/71427

Log:
merge to release
Properties modified: 
   branches/release/boost/archive/   (props changed)
   branches/release/boost/archive/basic_binary_iarchive.hpp   (props changed)
   branches/release/boost/serialization/   (props changed)
Text files modified: 
   branches/release/boost/serialization/export.hpp         |     2 +-                                      
   branches/release/boost/serialization/strong_typedef.hpp |     4 ++--                                    
   branches/release/boost/serialization/version.hpp        |     5 +++++                                   
   3 files changed, 8 insertions(+), 3 deletions(-)

Modified: branches/release/boost/serialization/export.hpp
==============================================================================
--- branches/release/boost/serialization/export.hpp	(original)
+++ branches/release/boost/serialization/export.hpp	2011-04-22 19:43:18 EDT (Fri, 22 Apr 2011)
@@ -131,7 +131,7 @@
         // through pointers to their base classes.
         instantiate_ptr_serialization((T*)0, 0, adl_tag());
     }
-    const void export_guid(mpl::true_) const {
+    void export_guid(mpl::true_) const {
     }
     guid_initializer const & export_guid() const {
         BOOST_STATIC_WARNING(boost::is_polymorphic< T >::value);

Modified: branches/release/boost/serialization/strong_typedef.hpp
==============================================================================
--- branches/release/boost/serialization/strong_typedef.hpp	(original)
+++ branches/release/boost/serialization/strong_typedef.hpp	2011-04-22 19:43:18 EDT (Fri, 22 Apr 2011)
@@ -34,7 +34,7 @@
     {                                                               \
         T t;                                                        \
         explicit D(const T t_) : t(t_) {};                          \
-        D(){};                                                      \
+        D(): t() {};                                                \
         D(const D & t_) : t(t_.t){}                                 \
         D & operator=(const D & rhs) { t = rhs.t; return *this;}    \
         D & operator=(const T & rhs) { t = rhs; return *this;}      \
@@ -52,7 +52,7 @@
     {                                                               \
         T t;                                                        \
         explicit D(const T t_) : t(t_) {};                          \
-        D(){};                                                      \
+        D() : t(){};                                                \
         D(const D & t_) : t(t_.t){}                                 \
         D & operator=(const D & rhs) { t = rhs.t; return *this;}    \
         D & operator=(const T & rhs) { t = rhs; return *this;}      \

Modified: branches/release/boost/serialization/version.hpp
==============================================================================
--- branches/release/boost/serialization/version.hpp	(original)
+++ branches/release/boost/serialization/version.hpp	2011-04-22 19:43:18 EDT (Fri, 22 Apr 2011)
@@ -52,6 +52,11 @@
     BOOST_STATIC_CONSTANT(int, value = version::type::value);
 };
 
+#ifndef BOOST_NO_INCLASS_MEMBER_INITIALIZATION
+template<class T>
+const int version<T>::value;
+#endif
+
 } // namespace serialization
 } // namespace boost