summaryrefslogtreecommitdiff
path: root/boost/serialization
diff options
context:
space:
mode:
authorAnas Nashif <anas.nashif@intel.com>2013-08-26 08:15:55 -0400
committerAnas Nashif <anas.nashif@intel.com>2013-08-26 08:15:55 -0400
commitbb4dd8289b351fae6b55e303f189127a394a1edd (patch)
tree77c9c35a31b1459dd7988c2448e797d142530c41 /boost/serialization
parent1a78a62555be32868418fe52f8e330c9d0f95d5a (diff)
downloadboost-bb4dd8289b351fae6b55e303f189127a394a1edd.tar.gz
boost-bb4dd8289b351fae6b55e303f189127a394a1edd.tar.bz2
boost-bb4dd8289b351fae6b55e303f189127a394a1edd.zip
Imported Upstream version 1.51.0upstream/1.51.0
Diffstat (limited to 'boost/serialization')
-rw-r--r--boost/serialization/detail/get_data.hpp14
-rw-r--r--boost/serialization/extended_type_info_no_rtti.hpp2
-rw-r--r--boost/serialization/extended_type_info_typeid.hpp2
-rw-r--r--boost/serialization/factory.hpp2
-rw-r--r--boost/serialization/force_include.hpp6
-rw-r--r--boost/serialization/valarray.hpp4
-rw-r--r--boost/serialization/vector.hpp9
-rw-r--r--boost/serialization/vector_135.hpp2
8 files changed, 28 insertions, 13 deletions
diff --git a/boost/serialization/detail/get_data.hpp b/boost/serialization/detail/get_data.hpp
index 0e9c190295..3cbcb4a30c 100644
--- a/boost/serialization/detail/get_data.hpp
+++ b/boost/serialization/detail/get_data.hpp
@@ -19,11 +19,12 @@
#define STD std
#endif
-
#include <vector>
#include <valarray>
-namespace boost { namespace serialization { namespace detail {
+namespace boost {
+namespace serialization {
+namespace detail {
template <class T, class Allocator>
T* get_data(STD::vector<T,Allocator>& v)
@@ -37,7 +38,6 @@ T* get_data(STD::vector<T,Allocator> const & v)
return get_data(const_cast<STD::vector<T,Allocator>&>(v));
}
-
template <class T>
T* get_data(STD::valarray<T>& v)
{
@@ -50,6 +50,12 @@ const T* get_data(STD::valarray<T> const& v)
return get_data(const_cast<STD::valarray<T>&>(v));
}
-} } } //namespace boost::serialization::detail
+} // detail
+} // serialization
+} // boost
+
+#if defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)
+#undef STD
+#endif
#endif // BOOST_SERIALIZATION_DETAIL_GET_DATA_HPP
diff --git a/boost/serialization/extended_type_info_no_rtti.hpp b/boost/serialization/extended_type_info_no_rtti.hpp
index 0f0b275a49..025b3f6964 100644
--- a/boost/serialization/extended_type_info_no_rtti.hpp
+++ b/boost/serialization/extended_type_info_no_rtti.hpp
@@ -147,7 +147,7 @@ public:
}
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) ;
}
diff --git a/boost/serialization/extended_type_info_typeid.hpp b/boost/serialization/extended_type_info_typeid.hpp
index d60c369fde..9f09587d67 100644
--- a/boost/serialization/extended_type_info_typeid.hpp
+++ b/boost/serialization/extended_type_info_typeid.hpp
@@ -131,7 +131,7 @@ public:
}
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);
}
diff --git a/boost/serialization/factory.hpp b/boost/serialization/factory.hpp
index 73f660416f..a25bf204fd 100644
--- a/boost/serialization/factory.hpp
+++ b/boost/serialization/factory.hpp
@@ -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
diff --git a/boost/serialization/force_include.hpp b/boost/serialization/force_include.hpp
index a18a8a1b65..5578ee81d6 100644
--- a/boost/serialization/force_include.hpp
+++ b/boost/serialization/force_include.hpp
@@ -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
diff --git a/boost/serialization/valarray.hpp b/boost/serialization/valarray.hpp
index c018279d1f..4bf722f4d3 100644
--- a/boost/serialization/valarray.hpp
+++ b/boost/serialization/valarray.hpp
@@ -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 @@ void save( Archive & ar, const STD::valarray<U> &t, const unsigned int /*file_ve
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*/ )
{
diff --git a/boost/serialization/vector.hpp b/boost/serialization/vector.hpp
index 0fde185a08..7520c09a00 100644
--- a/boost/serialization/vector.hpp
+++ b/boost/serialization/vector.hpp
@@ -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 @@ inline void serialize(
#include <boost/serialization/collection_traits.hpp>
BOOST_SERIALIZATION_COLLECTION_TRAITS(std::vector)
+#undef STD
#endif // BOOST_SERIALIZATION_VECTOR_HPP
diff --git a/boost/serialization/vector_135.hpp b/boost/serialization/vector_135.hpp
index 3554a24471..2097cf641e 100644
--- a/boost/serialization/vector_135.hpp
+++ b/boost/serialization/vector_135.hpp
@@ -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>