Index: boost/interprocess/detail/move.hpp =================================================================== --- boost/interprocess/detail/move.hpp (revision 60287) +++ boost/interprocess/detail/move.hpp (working copy) @@ -62,7 +62,7 @@ /// @endcond -#if !defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) +#if defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) //#define BOOST_MOVE_ASSIGN_FROM_NON_CONST_RVALUE @@ -273,7 +273,7 @@ } //namespace interprocess { } //namespace boost -#else //BOOST_HAS_RVALUE_REFS +#else // BOOST_NO_RVALUE_REFERENCES #include @@ -451,7 +451,7 @@ } //namespace interprocess { } //namespace boost { -#endif //BOOST_HAS_RVALUE_REFS +#endif // BOOST_NO_RVALUE_REFERENCES namespace boost { namespace interprocess { @@ -473,7 +473,7 @@ public: typedef It iterator_type; typedef typename std::iterator_traits::value_type value_type; - #if defined(BOOST_HAS_RVALUE_REFS) || defined(BOOST_MOVE_DOXYGEN_INVOKED) + #if !defined(BOOST_NO_RVALUE_REFERENCES) || defined(BOOST_MOVE_DOXYGEN_INVOKED) typedef value_type && reference; #else typedef typename ::boost::mpl::if_ @@ -502,7 +502,7 @@ reference operator*() const { - #if defined(BOOST_HAS_RVALUE_REFS) + #if !defined(BOOST_NO_RVALUE_REFERENCES) return *m_it; #else return ::boost::interprocess::move(*m_it); @@ -538,7 +538,7 @@ reference operator[](difference_type n) const { - #if defined(BOOST_HAS_RVALUE_REFS) + #if !defined(BOOST_NO_RVALUE_REFERENCES) return m_it[n]; #else return ::boost::interprocess::move(m_it[n]); Index: boost/interprocess/detail/preprocessor.hpp =================================================================== --- boost/interprocess/detail/preprocessor.hpp (revision 60287) +++ boost/interprocess/detail/preprocessor.hpp (working copy) @@ -36,7 +36,7 @@ //This cast is ugly but it is necessary until "perfect forwarding" //is achieved in C++0x. Meanwhile, if we want to be able to //bind rvalues with non-const references, we have to be ugly -#ifdef BOOST_HAS_RVALUE_REFS +#ifndef BOOST_NO_RVALUE_REFERENCES #define BOOST_INTERPROCESS_PP_PARAM_LIST(z, n, data) \ BOOST_PP_CAT(P, n) && BOOST_PP_CAT(p, n) \ //! @@ -46,7 +46,7 @@ //! #endif -#ifdef BOOST_HAS_RVALUE_REFS +#ifndef BOOST_NO_RVALUE_REFERENCES #define BOOST_INTERPROCESS_PARAM(U, u) \ U && u \ //! @@ -56,7 +56,7 @@ //! #endif -#ifdef BOOST_HAS_RVALUE_REFS +#ifndef BOOST_NO_RVALUE_REFERENCES #define BOOST_INTERPROCESS_AUX_PARAM_INIT(z, n, data) \ BOOST_PP_CAT(m_p, n) (BOOST_PP_CAT(p, n)) \ //! @@ -70,7 +70,7 @@ BOOST_PP_CAT(++m_p, n) \ //! -#ifdef BOOST_HAS_RVALUE_REFS +#ifndef BOOST_NO_RVALUE_REFERENCES #define BOOST_INTERPROCESS_AUX_PARAM_DEFINE(z, n, data) \ BOOST_PP_CAT(P, n) && BOOST_PP_CAT(m_p, n); \ //! Index: boost/interprocess/detail/workaround.hpp =================================================================== --- boost/interprocess/detail/workaround.hpp (revision 60287) +++ boost/interprocess/detail/workaround.hpp (working copy) @@ -115,7 +115,7 @@ #endif -#if defined(BOOST_HAS_RVALUE_REFS) && defined(BOOST_HAS_VARIADIC_TMPL)\ +#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_VARIADIC_TEMPLATES)\ && !defined(BOOST_INTERPROCESS_DISABLE_VARIADIC_TMPL) #define BOOST_INTERPROCESS_PERFECT_FORWARDING #endif Index: boost/interprocess/containers/container/list.hpp =================================================================== --- boost/interprocess/containers/container/list.hpp (revision 60287) +++ boost/interprocess/containers/container/list.hpp (working copy) @@ -572,7 +572,7 @@ void push_front(insert_const_ref_type x) { this->insert(this->cbegin(), x); } - #if !defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) + #if defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) void push_front(T &x) { push_front(const_cast(x)); } template @@ -597,7 +597,7 @@ void push_back (insert_const_ref_type x) { this->insert(this->cend(), x); } - #if !defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) + #if defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) void push_back(T &x) { push_back(const_cast(x)); } template @@ -808,7 +808,7 @@ iterator insert(const_iterator position, insert_const_ref_type x) { return this->priv_insert(position, x); } - #if !defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) + #if defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) iterator insert(const_iterator position, T &x) { return this->insert(position, const_cast(x)); } template Index: boost/interprocess/containers/container/set.hpp =================================================================== --- boost/interprocess/containers/container/set.hpp (revision 60287) +++ boost/interprocess/containers/container/set.hpp (working copy) @@ -357,7 +357,7 @@ std::pair insert(insert_const_ref_type x) { return priv_insert(x); } - #if !defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) + #if defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) std::pair insert(T &x) { return this->insert(const_cast(x)); } @@ -389,7 +389,7 @@ iterator insert(const_iterator p, insert_const_ref_type x) { return priv_insert(p, x); } - #if !defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) + #if defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) iterator insert(const_iterator position, T &x) { return this->insert(position, const_cast(x)); } @@ -912,7 +912,7 @@ iterator insert(insert_const_ref_type x) { return priv_insert(x); } - #if !defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) + #if defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) iterator insert(T &x) { return this->insert(const_cast(x)); } @@ -942,7 +942,7 @@ iterator insert(const_iterator p, insert_const_ref_type x) { return priv_insert(p, x); } - #if !defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) + #if defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) iterator insert(const_iterator position, T &x) { return this->insert(position, const_cast(x)); } Index: boost/interprocess/containers/container/detail/workaround.hpp =================================================================== --- boost/interprocess/containers/container/detail/workaround.hpp (revision 60287) +++ boost/interprocess/containers/container/detail/workaround.hpp (working copy) @@ -13,7 +13,7 @@ #include -#if defined(BOOST_HAS_RVALUE_REFS) && defined(BOOST_HAS_VARIADIC_TMPL)\ +#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_VARIADIC_TEMPLATES)\ && !defined(BOOST_INTERPROCESS_DISABLE_VARIADIC_TMPL) #define BOOST_CONTAINERS_PERFECT_FORWARDING Index: boost/interprocess/containers/container/detail/pair.hpp =================================================================== --- boost/interprocess/containers/container/detail/pair.hpp (revision 60287) +++ boost/interprocess/containers/container/detail/pair.hpp (working copy) @@ -100,7 +100,7 @@ template pair( BOOST_CONTAINERS_PARAM(U, u) - #ifndef BOOST_HAS_RVALUE_REFS + #ifdef BOOST_NO_RVALUE_REFERENCES , typename containers_detail::disable_if < containers_detail::is_same > >::type* = 0 #endif Index: boost/interprocess/containers/container/detail/tree.hpp =================================================================== --- boost/interprocess/containers/container/detail/tree.hpp (revision 60287) +++ boost/interprocess/containers/container/detail/tree.hpp (working copy) @@ -200,7 +200,7 @@ }; }//namespace containers_detail { -#if !defined(BOOST_HAS_RVALUE_REFS) +#if defined(BOOST_NO_RVALUE_REFERENCES) template struct has_own_construct_from_it < boost::container::containers_detail::rbtree_node > Index: boost/interprocess/containers/container/detail/algorithms.hpp =================================================================== --- boost/interprocess/containers/container/detail/algorithms.hpp (revision 60287) +++ boost/interprocess/containers/container/detail/algorithms.hpp (working copy) @@ -35,7 +35,7 @@ namespace boost { namespace container { -#if !defined(BOOST_HAS_RVALUE_REFS) +#if defined(BOOST_NO_RVALUE_REFERENCES) template struct has_own_construct_from_it { Index: boost/interprocess/containers/container/detail/preprocessor.hpp =================================================================== --- boost/interprocess/containers/container/detail/preprocessor.hpp (revision 60287) +++ boost/interprocess/containers/container/detail/preprocessor.hpp (working copy) @@ -36,7 +36,7 @@ //This cast is ugly but it is necessary until "perfect forwarding" //is achieved in C++0x. Meanwhile, if we want to be able to //bind rvalues with non-const references, we have to be ugly -#ifdef BOOST_HAS_RVALUE_REFS +#ifndef BOOST_NO_RVALUE_REFERENCES #define BOOST_CONTAINERS_PP_PARAM_LIST(z, n, data) \ BOOST_PP_CAT(P, n) && BOOST_PP_CAT(p, n) \ //! @@ -46,7 +46,7 @@ //! #endif -#ifdef BOOST_HAS_RVALUE_REFS +#ifndef BOOST_NO_RVALUE_REFERENCES #define BOOST_CONTAINERS_PARAM(U, u) \ U && u \ //! @@ -56,7 +56,7 @@ //! #endif -#ifdef BOOST_HAS_RVALUE_REFS +#ifndef BOOST_NO_RVALUE_REFERENCES #define BOOST_CONTAINERS_AUX_PARAM_INIT(z, n, data) \ BOOST_PP_CAT(m_p, n) (BOOST_PP_CAT(p, n)) \ //! @@ -70,7 +70,7 @@ BOOST_PP_CAT(++m_p, n) \ //! -#ifdef BOOST_HAS_RVALUE_REFS +#ifndef BOOST_NO_RVALUE_REFERENCES #define BOOST_CONTAINERS_AUX_PARAM_DEFINE(z, n, data) \ BOOST_PP_CAT(P, n) && BOOST_PP_CAT(m_p, n); \ //! Index: boost/interprocess/containers/container/stable_vector.hpp =================================================================== --- boost/interprocess/containers/container/stable_vector.hpp (revision 60287) +++ boost/interprocess/containers/container/stable_vector.hpp (working copy) @@ -672,7 +672,7 @@ void push_back(insert_const_ref_type x) { return priv_push_back(x); } - #if !defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) + #if defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) void push_back(T &x) { push_back(const_cast(x)); } template @@ -689,7 +689,7 @@ iterator insert(const_iterator position, insert_const_ref_type x) { return this->priv_insert(position, x); } - #if !defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) + #if defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) iterator insert(const_iterator position, T &x) { return this->insert(position, const_cast(x)); } template Index: boost/interprocess/containers/container/slist.hpp =================================================================== --- boost/interprocess/containers/container/slist.hpp (revision 60287) +++ boost/interprocess/containers/container/slist.hpp (working copy) @@ -631,7 +631,7 @@ void push_front(insert_const_ref_type x) { return priv_push_front(x); } - #if !defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) + #if defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) void push_front(T &x) { push_front(const_cast(x)); } template @@ -692,7 +692,7 @@ iterator insert_after(const_iterator prev_pos, insert_const_ref_type x) { return this->priv_insert_after(prev_pos, x); } - #if !defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) + #if defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) iterator insert_after(const_iterator position, T &x) { return this->insert_after(position, const_cast(x)); } @@ -760,7 +760,7 @@ iterator insert(const_iterator position, insert_const_ref_type x) { return this->priv_insert(position, x); } - #if !defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) + #if defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) iterator insert(const_iterator position, T &x) { return this->insert(position, const_cast(x)); } Index: boost/interprocess/containers/container/flat_set.hpp =================================================================== --- boost/interprocess/containers/container/flat_set.hpp (revision 60287) +++ boost/interprocess/containers/container/flat_set.hpp (working copy) @@ -331,7 +331,7 @@ std::pair insert(insert_const_ref_type x) { return priv_insert(x); } - #if !defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) + #if defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) std::pair insert(T &x) { return this->insert(const_cast(x)); } @@ -368,7 +368,7 @@ iterator insert(const_iterator p, insert_const_ref_type x) { return priv_insert(p, x); } - #if !defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) + #if defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) iterator insert(const_iterator position, T &x) { return this->insert(position, const_cast(x)); } @@ -922,7 +922,7 @@ iterator insert(insert_const_ref_type x) { return priv_insert(x); } - #if !defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) + #if defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) iterator insert(T &x) { return this->insert(const_cast(x)); } @@ -954,7 +954,7 @@ iterator insert(const_iterator p, insert_const_ref_type x) { return priv_insert(p, x); } - #if !defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) + #if defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) iterator insert(const_iterator position, T &x) { return this->insert(position, const_cast(x)); } Index: boost/interprocess/containers/container/vector.hpp =================================================================== --- boost/interprocess/containers/container/vector.hpp (revision 60287) +++ boost/interprocess/containers/container/vector.hpp (working copy) @@ -903,7 +903,7 @@ void push_back(insert_const_ref_type x) { return priv_push_back(x); } - #if !defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) + #if defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) void push_back(T &x) { push_back(const_cast(x)); } template @@ -1062,7 +1062,7 @@ iterator insert(const_iterator position, insert_const_ref_type x) { return this->priv_insert(position, x); } - #if !defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) + #if defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) iterator insert(const_iterator position, T &x) { return this->insert(position, const_cast(x)); } template Index: boost/interprocess/containers/container/deque.hpp =================================================================== --- boost/interprocess/containers/container/deque.hpp (revision 60287) +++ boost/interprocess/containers/container/deque.hpp (working copy) @@ -697,7 +697,7 @@ this->priv_assign_dispatch(first, last, Result()); } - #if !defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) + #if defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) void push_back(T &x) { push_back(const_cast(x)); } template @@ -719,7 +719,7 @@ } } - #if !defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) + #if defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) void push_front(T &x) { push_front(const_cast(x)); } template @@ -761,7 +761,7 @@ this->priv_pop_front_aux(); } - #if !defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) + #if defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) iterator insert(const_iterator position, T &x) { return this->insert(position, const_cast(x)); }