Subject: [Boost-commit] svn:boost r61871 - in branches/release/boost/interprocess: . containers/container/detail detail
From: dgregor_at_[hidden]
Date: 2010-05-08 22:12:20
Author: dgregor
Date: 2010-05-08 22:12:20 EDT (Sat, 08 May 2010)
New Revision: 61871
URL: http://svn.boost.org/trac/boost/changeset/61871
Log:
Merge standards-conformance fixes for Boost.Interprocess
Properties modified:
branches/release/boost/interprocess/ (props changed)
Text files modified:
branches/release/boost/interprocess/containers/container/detail/transform_iterator.hpp | 2 +-
branches/release/boost/interprocess/containers/container/detail/utilities.hpp | 16 ++++++++--------
branches/release/boost/interprocess/detail/managed_memory_impl.hpp | 4 ++--
branches/release/boost/interprocess/detail/transform_iterator.hpp | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
Modified: branches/release/boost/interprocess/containers/container/detail/transform_iterator.hpp
==============================================================================
--- branches/release/boost/interprocess/containers/container/detail/transform_iterator.hpp (original)
+++ branches/release/boost/interprocess/containers/container/detail/transform_iterator.hpp 2010-05-08 22:12:20 EDT (Sat, 08 May 2010)
@@ -51,7 +51,7 @@
// This function is needed for MWCW and BCC, which won't call operator->
// again automatically per 13.3.1.2 para 8
// operator T*() const { return &m_value; }
- mutable T &m_value;
+ T &m_value;
};
template <class Iterator, class UnaryFunction>
Modified: branches/release/boost/interprocess/containers/container/detail/utilities.hpp
==============================================================================
--- branches/release/boost/interprocess/containers/container/detail/utilities.hpp (original)
+++ branches/release/boost/interprocess/containers/container/detail/utilities.hpp 2010-05-08 22:12:20 EDT (Sat, 08 May 2010)
@@ -24,6 +24,14 @@
namespace container {
namespace containers_detail {
+template<class T>
+const T &max_value(const T &a, const T &b)
+{ return a > b ? a : b; }
+
+template<class T>
+const T &min_value(const T &a, const T &b)
+{ return a < b ? a : b; }
+
template <class SizeType>
SizeType
get_next_capacity(const SizeType max_size
@@ -44,14 +52,6 @@
return max_size;
}
-template<class T>
-const T &max_value(const T &a, const T &b)
-{ return a > b ? a : b; }
-
-template<class T>
-const T &min_value(const T &a, const T &b)
-{ return a < b ? a : b; }
-
template<class SmartPtr>
struct smart_ptr_type
{
Modified: branches/release/boost/interprocess/detail/managed_memory_impl.hpp
==============================================================================
--- branches/release/boost/interprocess/detail/managed_memory_impl.hpp (original)
+++ branches/release/boost/interprocess/detail/managed_memory_impl.hpp 2010-05-08 22:12:20 EDT (Sat, 08 May 2010)
@@ -673,7 +673,7 @@
template<class T>
typename allocator<T>::type
get_allocator()
- { return mp_header->get_allocator<T>(); }
+ { return mp_header->BOOST_NESTED_TEMPLATE get_allocator<T>(); }
//!This is the default deleter to delete types T
//!from this managed segment.
@@ -688,7 +688,7 @@
template<class T>
typename deleter<T>::type
get_deleter()
- { return mp_header->get_deleter<T>(); }
+ { return mp_header->BOOST_NESTED_TEMPLATE get_deleter<T>(); }
/// @cond
//!Tries to find a previous named allocation address. Returns a memory
Modified: branches/release/boost/interprocess/detail/transform_iterator.hpp
==============================================================================
--- branches/release/boost/interprocess/detail/transform_iterator.hpp (original)
+++ branches/release/boost/interprocess/detail/transform_iterator.hpp 2010-05-08 22:12:20 EDT (Sat, 08 May 2010)
@@ -54,7 +54,7 @@
// This function is needed for MWCW and BCC, which won't call operator->
// again automatically per 13.3.1.2 para 8
// operator T*() const { return &m_value; }
- mutable T &m_value;
+ T &m_value;
};
template <class Iterator, class UnaryFunction>