Subject: [Boost-commit] svn:boost r49146 - in trunk/boost: archive archive/detail serialization
From: ramey_at_[hidden]
Date: 2008-10-06 12:30:31
Author: ramey
Date: 2008-10-06 12:30:30 EDT (Mon, 06 Oct 2008)
New Revision: 49146
URL: http://svn.boost.org/trac/boost/changeset/49146
Log:
Better support for Borland compiler
Text files modified:
trunk/boost/archive/basic_binary_iprimitive.hpp | 12 +++++++++---
trunk/boost/archive/basic_binary_oprimitive.hpp | 12 +++++++++---
trunk/boost/archive/detail/abi_suffix.hpp | 8 ++++----
trunk/boost/serialization/static_warning.hpp | 2 --
4 files changed, 22 insertions(+), 12 deletions(-)
Modified: trunk/boost/archive/basic_binary_iprimitive.hpp
==============================================================================
--- trunk/boost/archive/basic_binary_iprimitive.hpp (original)
+++ trunk/boost/archive/basic_binary_iprimitive.hpp 2008-10-06 12:30:30 EDT (Mon, 06 Oct 2008)
@@ -122,9 +122,15 @@
// we provide an optimized load for all fundamental types
// typedef serialization::is_bitwise_serializable<mpl::_1>
// use_array_optimization;
- struct use_array_optimization {
- template <class T>
- struct apply : public serialization::is_bitwise_serializable<T> {};
+ struct use_array_optimization {
+ template <class T>
+ #if defined(BOOST_NO_DEPENDENT_NESTED_DERIVATIONS)
+ struct apply {
+ typedef BOOST_DEDUCED_TYPENAME boost::serialization::is_bitwise_serializable<T>::type type;
+ };
+ #else
+ struct apply : public boost::serialization::is_bitwise_serializable<T> {};
+ #endif
};
// the optimized load_array dispatches to load_binary
Modified: trunk/boost/archive/basic_binary_oprimitive.hpp
==============================================================================
--- trunk/boost/archive/basic_binary_oprimitive.hpp (original)
+++ trunk/boost/archive/basic_binary_oprimitive.hpp 2008-10-06 12:30:30 EDT (Mon, 06 Oct 2008)
@@ -116,11 +116,17 @@
// we provide an optimized save for all fundamental types
// typedef serialization::is_bitwise_serializable<mpl::_1>
- // use_array_optimization;
+ // use_array_optimization;
// workaround without using mpl lambdas
struct use_array_optimization {
- template <class T>
- struct apply : public boost::serialization::is_bitwise_serializable<T> {};
+ template <class T>
+ #if defined(BOOST_NO_DEPENDENT_NESTED_DERIVATIONS)
+ struct apply {
+ typedef BOOST_DEDUCED_TYPENAME boost::serialization::is_bitwise_serializable<T>::type type;
+ };
+ #else
+ struct apply : public boost::serialization::is_bitwise_serializable<T> {};
+ #endif
};
Modified: trunk/boost/archive/detail/abi_suffix.hpp
==============================================================================
--- trunk/boost/archive/detail/abi_suffix.hpp (original)
+++ trunk/boost/archive/detail/abi_suffix.hpp 2008-10-06 12:30:30 EDT (Mon, 06 Oct 2008)
@@ -8,12 +8,12 @@
// See http://www.boost.org for updates, documentation, and revision history.
-#if defined( __BORLANDC__ )
-#pragma nopushoptwarn
-#endif
-
#ifdef BOOST_MSVC
#pragma warning(pop)
#endif
#include <boost/config/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
+#if defined( __BORLANDC__ )
+#pragma nopushoptwarn
+#endif
+
Modified: trunk/boost/serialization/static_warning.hpp
==============================================================================
--- trunk/boost/serialization/static_warning.hpp (original)
+++ trunk/boost/serialization/static_warning.hpp 2008-10-06 12:30:30 EDT (Mon, 06 Oct 2008)
@@ -77,8 +77,6 @@
//------------------Configure-------------------------------------------------//
# if defined(BOOST_INTEL)
-# elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x600)
-# define BOOST_HAS_DESCRIPTIVE_UNREFERENCED_VARIABLE_WARNING
# elif defined(__PGI)
# define BOOST_HAS_DESCRIPTIVE_DIVIDE_BY_ZERO_WARNING
# elif defined(__GNUC__) && !defined(BOOST_INTEL) // && (__GNUC__ * 100 + __GNUC_MINOR__ <= 302)