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

Subject: [Boost-commit] svn:boost r79993 - in branches/release/boost: archive serialization
From: ramey_at_[hidden]
Date: 2012-08-12 21:41:49

Author: ramey
Date: 2012-08-12 21:41:48 EDT (Sun, 12 Aug 2012)
New Revision: 79993
URL: http://svn.boost.org/trac/boost/changeset/79993

Log:
merge to release
Properties modified: 
   branches/release/boost/archive/   (props changed)
   branches/release/boost/serialization/   (props changed)
Text files modified: 
   branches/release/boost/archive/basic_archive.hpp     |     3 ++-                                     
   branches/release/boost/archive/shared_ptr_helper.hpp |     2 +-                                      
   branches/release/boost/serialization/factory.hpp     |     2 +-                                      
   branches/release/boost/serialization/valarray.hpp    |     4 ++--                                    
   branches/release/boost/serialization/vector.hpp      |     9 +++++++++                               
   5 files changed, 15 insertions(+), 5 deletions(-)

Modified: branches/release/boost/archive/basic_archive.hpp
==============================================================================
--- branches/release/boost/archive/basic_archive.hpp	(original)
+++ branches/release/boost/archive/basic_archive.hpp	2012-08-12 21:41:48 EDT (Sun, 12 Aug 2012)
@@ -150,7 +150,8 @@
     base_type t;
 public:
     object_id_type(): t(0) {};
-    explicit object_id_type(const unsigned int & t_) : t(t_){
+    // note: presumes that size_t >= unsigned int.
+    explicit object_id_type(const std::size_t & t_) : t(t_){
         BOOST_ASSERT(t_ <= boost::integer_traits<base_type>::const_max);
     }
     object_id_type(const object_id_type & t_) : 

Modified: branches/release/boost/archive/shared_ptr_helper.hpp
==============================================================================
--- branches/release/boost/archive/shared_ptr_helper.hpp	(original)
+++ branches/release/boost/archive/shared_ptr_helper.hpp	2012-08-12 21:41:48 EDT (Sun, 12 Aug 2012)
@@ -127,7 +127,7 @@
     template<class T>
     struct non_polymorphic {
         static const boost::serialization::extended_type_info * 
-        get_object_identifier(T & t){
+        get_object_identifier(T &){
             return & boost::serialization::singleton<
                 BOOST_DEDUCED_TYPENAME 
                 boost::serialization::type_info_implementation< T >::type

Modified: branches/release/boost/serialization/factory.hpp
==============================================================================
--- branches/release/boost/serialization/factory.hpp	(original)
+++ branches/release/boost/serialization/factory.hpp	2012-08-12 21:41:48 EDT (Sun, 12 Aug 2012)
@@ -24,7 +24,7 @@
 #include <boost/preprocessor/facilities/empty.hpp>
 
 namespace std{
-    #if defined(__LIBCOMO__) || defined(__QNXNTO__) 
+    #if defined(__LIBCOMO__)
         using ::va_list;
     #endif
 } // namespace std

Modified: branches/release/boost/serialization/valarray.hpp
==============================================================================
--- branches/release/boost/serialization/valarray.hpp	(original)
+++ branches/release/boost/serialization/valarray.hpp	2012-08-12 21:41:48 EDT (Sun, 12 Aug 2012)
@@ -31,7 +31,8 @@
 #define STD std
 #endif
 
-namespace boost { namespace serialization {
+namespace boost { 
+namespace serialization {
 
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // valarray< T >
@@ -45,7 +46,6 @@
     ar << make_array(detail::get_data(t), t.size());
 }
 
-
 template<class Archive, class U>
 void load( Archive & ar, STD::valarray<U> &t,  const unsigned int /*file_version*/ )
 {

Modified: branches/release/boost/serialization/vector.hpp
==============================================================================
--- branches/release/boost/serialization/vector.hpp	(original)
+++ branches/release/boost/serialization/vector.hpp	2012-08-12 21:41:48 EDT (Sun, 12 Aug 2012)
@@ -35,6 +35,14 @@
 #define BOOST_SERIALIZATION_VECTOR_VERSIONED(V) (V==4 || V==5)
 #endif
 
+// function specializations must be defined in the appropriate
+// namespace - boost::serialization
+#if defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)
+#define STD _STLP_STD
+#else
+#define STD std
+#endif
+
 namespace boost { 
 namespace serialization {
 
@@ -207,5 +215,6 @@
 #include <boost/serialization/collection_traits.hpp>
 
 BOOST_SERIALIZATION_COLLECTION_TRAITS(std::vector)
+#undef STD
 
 #endif // BOOST_SERIALIZATION_VECTOR_HPP