Subject: [Boost-commit] svn:boost r79542 - in branches/release/boost/archive: . detail
From: ramey_at_[hidden]
Date: 2012-07-15 13:41:25
Author: ramey
Date: 2012-07-15 13:41:24 EDT (Sun, 15 Jul 2012)
New Revision: 79542
URL: http://svn.boost.org/trac/boost/changeset/79542
Log:
merge to release
Properties modified:
branches/release/boost/archive/ (props changed)
Text files modified:
branches/release/boost/archive/detail/basic_serializer_map.hpp | 2 +-
branches/release/boost/archive/detail/iserializer.hpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Modified: branches/release/boost/archive/detail/basic_serializer_map.hpp
==============================================================================
--- branches/release/boost/archive/detail/basic_serializer_map.hpp (original)
+++ branches/release/boost/archive/detail/basic_serializer_map.hpp 2012-07-15 13:41:24 EDT (Sun, 15 Jul 2012)
@@ -19,7 +19,7 @@
#include <set>
#include <boost/config.hpp>
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
#include <boost/archive/detail/auto_link_archive.hpp>
#include <boost/archive/detail/abi_prefix.hpp> // must be the last header
Modified: branches/release/boost/archive/detail/iserializer.hpp
==============================================================================
--- branches/release/boost/archive/detail/iserializer.hpp (original)
+++ branches/release/boost/archive/detail/iserializer.hpp 2012-07-15 13:41:24 EDT (Sun, 15 Jul 2012)
@@ -61,7 +61,7 @@
#define DONT_USE_HAS_NEW_OPERATOR ( \
defined(__BORLANDC__) \
- || defined(__IBMCPP__) \
+ || BOOST_WORKAROUND(__IBMCPP__, < 1210) \
|| defined(BOOST_MSVC) && (BOOST_MSVC <= 1300) \
|| defined(__SUNPRO_CC) && (__SUNPRO_CC < 0x590) \
)