diff --git a/include/boost/interprocess/containers/container/detail/config_begin.hpp b/include/boost/interprocess/containers/container/detail/config_begin.hpp index d744005..84e5f54 100644 --- a/include/boost/interprocess/containers/container/detail/config_begin.hpp +++ b/include/boost/interprocess/containers/container/detail/config_begin.hpp @@ -16,12 +16,12 @@ #ifdef BOOST_MOVE_IN_INTERPROCESS -#define INCLUDE_BOOST_CONTAINER_MOVE_HPP +#define INCLUDE_BOOST_CONTAINER_MOVE_HPP #define BOOST_CONTAINER_MOVE_NAMESPACE boost::interprocess #else -#define INCLUDE_BOOST_CONTAINER_MOVE_HPP +#define INCLUDE_BOOST_CONTAINER_MOVE_HPP #define BOOST_CONTAINER_MOVE_NAMESPACE boost #endif diff --git a/include/boost/interprocess/containers/container/detail/transform_iterator.hpp b/include/boost/interprocess/containers/container/detail/transform_iterator.hpp index 4e98c77..6ca8b69 100644 --- a/include/boost/interprocess/containers/container/detail/transform_iterator.hpp +++ b/include/boost/interprocess/containers/container/detail/transform_iterator.hpp @@ -51,7 +51,7 @@ struct operator_arrow_proxy // 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 diff --git a/include/boost/interprocess/detail/managed_memory_impl.hpp b/include/boost/interprocess/detail/managed_memory_impl.hpp index 8cf4e50..395b4d8 100644 --- a/include/boost/interprocess/detail/managed_memory_impl.hpp +++ b/include/boost/interprocess/detail/managed_memory_impl.hpp @@ -682,7 +682,7 @@ class basic_managed_memory_impl template typename allocator::type get_allocator() - { return mp_header->get_allocator(); } + { return mp_header->BOOST_NESTED_TEMPLATE get_allocator(); } //!This is the default deleter to delete types T //!from this managed segment. @@ -697,7 +697,7 @@ class basic_managed_memory_impl template typename deleter::type get_deleter() - { return mp_header->get_deleter(); } + { return mp_header->BOOST_NESTED_TEMPLATE get_deleter(); } /// @cond //!Tries to find a previous named allocation address. Returns a memory diff --git a/include/boost/interprocess/detail/transform_iterator.hpp b/include/boost/interprocess/detail/transform_iterator.hpp index f98c641..b6e1139 100644 --- a/include/boost/interprocess/detail/transform_iterator.hpp +++ b/include/boost/interprocess/detail/transform_iterator.hpp @@ -54,7 +54,7 @@ struct operator_arrow_proxy // 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