Subject: [Boost-commit] svn:boost r77577 - branches/release/boost/serialization
From: ramey_at_[hidden]
Date: 2012-03-26 18:49:46
Author: ramey
Date: 2012-03-26 18:49:45 EDT (Mon, 26 Mar 2012)
New Revision: 77577
URL: http://svn.boost.org/trac/boost/changeset/77577
Log:
Merge trunk to release
Properties modified:
branches/release/boost/serialization/ (props changed)
Text files modified:
branches/release/boost/serialization/extended_type_info_no_rtti.hpp | 2 +-
branches/release/boost/serialization/extended_type_info_typeid.hpp | 2 +-
branches/release/boost/serialization/force_include.hpp | 6 +++---
branches/release/boost/serialization/vector_135.hpp | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
Modified: branches/release/boost/serialization/extended_type_info_no_rtti.hpp
==============================================================================
--- branches/release/boost/serialization/extended_type_info_no_rtti.hpp (original)
+++ branches/release/boost/serialization/extended_type_info_no_rtti.hpp 2012-03-26 18:49:45 EDT (Mon, 26 Mar 2012)
@@ -147,7 +147,7 @@
}
virtual void destroy(void const * const p) const{
boost::serialization::access::destroy(
- static_cast<T const * const>(p)
+ static_cast<T const *>(p)
);
//delete static_cast<T const * const>(p) ;
}
Modified: branches/release/boost/serialization/extended_type_info_typeid.hpp
==============================================================================
--- branches/release/boost/serialization/extended_type_info_typeid.hpp (original)
+++ branches/release/boost/serialization/extended_type_info_typeid.hpp 2012-03-26 18:49:45 EDT (Mon, 26 Mar 2012)
@@ -131,7 +131,7 @@
}
virtual void destroy(void const * const p) const {
boost::serialization::access::destroy(
- static_cast<T const * const>(p)
+ static_cast<T const *>(p)
);
//delete static_cast<T const * const>(p);
}
Modified: branches/release/boost/serialization/force_include.hpp
==============================================================================
--- branches/release/boost/serialization/force_include.hpp (original)
+++ branches/release/boost/serialization/force_include.hpp 2012-03-26 18:49:45 EDT (Mon, 26 Mar 2012)
@@ -40,11 +40,11 @@
# if defined(__MWERKS__)
# define BOOST_DLLEXPORT __declspec(dllexport)
# elif defined(__GNUC__) && (__GNUC__ >= 3)
-# define BOOST_USED __attribute__ ((used))
+# define BOOST_USED __attribute__ ((__used__))
# elif defined(__IBMCPP__) && (__IBMCPP__ >= 1110)
-# define BOOST_USED __attribute__ ((used))
+# define BOOST_USED __attribute__ ((__used__))
# elif defined(__INTEL_COMPILER) && (BOOST_INTEL_CXX_VERSION >= 800)
-# define BOOST_USED __attribute__ ((used))
+# define BOOST_USED __attribute__ ((__used__))
# endif
#endif
Modified: branches/release/boost/serialization/vector_135.hpp
==============================================================================
--- branches/release/boost/serialization/vector_135.hpp (original)
+++ branches/release/boost/serialization/vector_135.hpp 2012-03-26 18:49:45 EDT (Mon, 26 Mar 2012)
@@ -18,7 +18,7 @@
#error Boost.Serialization cannot be compatible with both 1.35 and 1.36-1.40 files
#endif
#else
-#define BOOST_SERIALIZATION_VECTOR_VERSIONED(V) (V==4)
+#define BOOST_SERIALIZATION_VECTOR_VERSIONED(V) (V>4)
#endif
#include <boost/serialization/vector.hpp>