diff --git a/include/boost/container/deque.hpp b/include/boost/container/deque.hpp index 3ec9ac8..dce2720 100644 --- a/include/boost/container/deque.hpp +++ b/include/boost/container/deque.hpp @@ -502,11 +502,11 @@ class deque : protected deque_base typedef typename ::boost::container::allocator_traits::size_type size_type; typedef typename ::boost::container::allocator_traits::difference_type difference_type; typedef Allocator allocator_type; - typedef BOOST_CONTAINER_IMPDEF(allocator_type) stored_allocator_type; - typedef BOOST_CONTAINER_IMPDEF(typename Base::iterator) iterator; - typedef BOOST_CONTAINER_IMPDEF(typename Base::const_iterator) const_iterator; - typedef BOOST_CONTAINER_IMPDEF(boost::container::reverse_iterator) reverse_iterator; - typedef BOOST_CONTAINER_IMPDEF(boost::container::reverse_iterator) const_reverse_iterator; + typedef BOOST_MOVE_IMPDEF(allocator_type) stored_allocator_type; + typedef BOOST_MOVE_IMPDEF(typename Base::iterator) iterator; + typedef BOOST_MOVE_IMPDEF(typename Base::const_iterator) const_iterator; + typedef BOOST_MOVE_IMPDEF(boost::container::reverse_iterator) reverse_iterator; + typedef BOOST_MOVE_IMPDEF(boost::container::reverse_iterator) const_reverse_iterator; #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED diff --git a/include/boost/container/detail/workaround.hpp b/include/boost/container/detail/workaround.hpp index 460ed31..2bb6f77 100644 --- a/include/boost/container/detail/workaround.hpp +++ b/include/boost/container/detail/workaround.hpp @@ -46,7 +46,7 @@ #endif //Macros for documentation purposes. For code, expands to the argument -#define BOOST_CONTAINER_IMPDEF(TYPE) TYPE +#define BOOST_MOVE_IMPDEF(TYPE) TYPE #define BOOST_CONTAINER_SEEDOC(TYPE) TYPE //Macros for memset optimization. In most platforms diff --git a/include/boost/container/flat_map.hpp b/include/boost/container/flat_map.hpp index 2107fe0..c54ba59 100644 --- a/include/boost/container/flat_map.hpp +++ b/include/boost/container/flat_map.hpp @@ -157,14 +157,14 @@ class flat_map typedef typename boost::container::allocator_traits::size_type size_type; typedef typename boost::container::allocator_traits::difference_type difference_type; typedef Allocator allocator_type; - typedef BOOST_CONTAINER_IMPDEF(Allocator) stored_allocator_type; - typedef BOOST_CONTAINER_IMPDEF(value_compare_impl) value_compare; + typedef BOOST_MOVE_IMPDEF(Allocator) stored_allocator_type; + typedef BOOST_MOVE_IMPDEF(value_compare_impl) value_compare; typedef Compare key_compare; - typedef BOOST_CONTAINER_IMPDEF(iterator_impl) iterator; - typedef BOOST_CONTAINER_IMPDEF(const_iterator_impl) const_iterator; - typedef BOOST_CONTAINER_IMPDEF(reverse_iterator_impl) reverse_iterator; - typedef BOOST_CONTAINER_IMPDEF(const_reverse_iterator_impl) const_reverse_iterator; - typedef BOOST_CONTAINER_IMPDEF(impl_value_type) movable_value_type; + typedef BOOST_MOVE_IMPDEF(iterator_impl) iterator; + typedef BOOST_MOVE_IMPDEF(const_iterator_impl) const_iterator; + typedef BOOST_MOVE_IMPDEF(reverse_iterator_impl) reverse_iterator; + typedef BOOST_MOVE_IMPDEF(const_reverse_iterator_impl) const_reverse_iterator; + typedef BOOST_MOVE_IMPDEF(impl_value_type) movable_value_type; public: ////////////////////////////////////////////// @@ -1152,14 +1152,14 @@ class flat_multimap typedef typename boost::container::allocator_traits::size_type size_type; typedef typename boost::container::allocator_traits::difference_type difference_type; typedef Allocator allocator_type; - typedef BOOST_CONTAINER_IMPDEF(Allocator) stored_allocator_type; - typedef BOOST_CONTAINER_IMPDEF(value_compare_impl) value_compare; + typedef BOOST_MOVE_IMPDEF(Allocator) stored_allocator_type; + typedef BOOST_MOVE_IMPDEF(value_compare_impl) value_compare; typedef Compare key_compare; - typedef BOOST_CONTAINER_IMPDEF(iterator_impl) iterator; - typedef BOOST_CONTAINER_IMPDEF(const_iterator_impl) const_iterator; - typedef BOOST_CONTAINER_IMPDEF(reverse_iterator_impl) reverse_iterator; - typedef BOOST_CONTAINER_IMPDEF(const_reverse_iterator_impl) const_reverse_iterator; - typedef BOOST_CONTAINER_IMPDEF(impl_value_type) movable_value_type; + typedef BOOST_MOVE_IMPDEF(iterator_impl) iterator; + typedef BOOST_MOVE_IMPDEF(const_iterator_impl) const_iterator; + typedef BOOST_MOVE_IMPDEF(reverse_iterator_impl) reverse_iterator; + typedef BOOST_MOVE_IMPDEF(const_reverse_iterator_impl) const_reverse_iterator; + typedef BOOST_MOVE_IMPDEF(impl_value_type) movable_value_type; ////////////////////////////////////////////// // diff --git a/include/boost/container/list.hpp b/include/boost/container/list.hpp index 1387d75..2bd5e94 100644 --- a/include/boost/container/list.hpp +++ b/include/boost/container/list.hpp @@ -167,11 +167,11 @@ class list typedef typename ::boost::container::allocator_traits::size_type size_type; typedef typename ::boost::container::allocator_traits::difference_type difference_type; typedef Allocator allocator_type; - typedef BOOST_CONTAINER_IMPDEF(NodeAlloc) stored_allocator_type; - typedef BOOST_CONTAINER_IMPDEF(iterator_impl) iterator; - typedef BOOST_CONTAINER_IMPDEF(const_iterator_impl) const_iterator; - typedef BOOST_CONTAINER_IMPDEF(boost::container::reverse_iterator) reverse_iterator; - typedef BOOST_CONTAINER_IMPDEF(boost::container::reverse_iterator) const_reverse_iterator; + typedef BOOST_MOVE_IMPDEF(NodeAlloc) stored_allocator_type; + typedef BOOST_MOVE_IMPDEF(iterator_impl) iterator; + typedef BOOST_MOVE_IMPDEF(const_iterator_impl) const_iterator; + typedef BOOST_MOVE_IMPDEF(boost::container::reverse_iterator) reverse_iterator; + typedef BOOST_MOVE_IMPDEF(boost::container::reverse_iterator) const_reverse_iterator; ////////////////////////////////////////////// // diff --git a/include/boost/container/map.hpp b/include/boost/container/map.hpp index 255cc59..3df1df5 100644 --- a/include/boost/container/map.hpp +++ b/include/boost/container/map.hpp @@ -109,15 +109,15 @@ class map typedef typename boost::container::allocator_traits::size_type size_type; typedef typename boost::container::allocator_traits::difference_type difference_type; typedef Allocator allocator_type; - typedef typename BOOST_CONTAINER_IMPDEF(base_t::stored_allocator_type) stored_allocator_type; - typedef BOOST_CONTAINER_IMPDEF(value_compare_impl) value_compare; + typedef typename BOOST_MOVE_IMPDEF(base_t::stored_allocator_type) stored_allocator_type; + typedef BOOST_MOVE_IMPDEF(value_compare_impl) value_compare; typedef Compare key_compare; - typedef typename BOOST_CONTAINER_IMPDEF(base_t::iterator) iterator; - typedef typename BOOST_CONTAINER_IMPDEF(base_t::const_iterator) const_iterator; - typedef typename BOOST_CONTAINER_IMPDEF(base_t::reverse_iterator) reverse_iterator; - typedef typename BOOST_CONTAINER_IMPDEF(base_t::const_reverse_iterator) const_reverse_iterator; + typedef typename BOOST_MOVE_IMPDEF(base_t::iterator) iterator; + typedef typename BOOST_MOVE_IMPDEF(base_t::const_iterator) const_iterator; + typedef typename BOOST_MOVE_IMPDEF(base_t::reverse_iterator) reverse_iterator; + typedef typename BOOST_MOVE_IMPDEF(base_t::const_reverse_iterator) const_reverse_iterator; typedef std::pair nonconst_value_type; - typedef BOOST_CONTAINER_IMPDEF(movable_value_type_impl) movable_value_type; + typedef BOOST_MOVE_IMPDEF(movable_value_type_impl) movable_value_type; ////////////////////////////////////////////// // @@ -917,15 +917,15 @@ class multimap typedef typename boost::container::allocator_traits::size_type size_type; typedef typename boost::container::allocator_traits::difference_type difference_type; typedef Allocator allocator_type; - typedef typename BOOST_CONTAINER_IMPDEF(base_t::stored_allocator_type) stored_allocator_type; - typedef BOOST_CONTAINER_IMPDEF(value_compare_impl) value_compare; + typedef typename BOOST_MOVE_IMPDEF(base_t::stored_allocator_type) stored_allocator_type; + typedef BOOST_MOVE_IMPDEF(value_compare_impl) value_compare; typedef Compare key_compare; - typedef typename BOOST_CONTAINER_IMPDEF(base_t::iterator) iterator; - typedef typename BOOST_CONTAINER_IMPDEF(base_t::const_iterator) const_iterator; - typedef typename BOOST_CONTAINER_IMPDEF(base_t::reverse_iterator) reverse_iterator; - typedef typename BOOST_CONTAINER_IMPDEF(base_t::const_reverse_iterator) const_reverse_iterator; + typedef typename BOOST_MOVE_IMPDEF(base_t::iterator) iterator; + typedef typename BOOST_MOVE_IMPDEF(base_t::const_iterator) const_iterator; + typedef typename BOOST_MOVE_IMPDEF(base_t::reverse_iterator) reverse_iterator; + typedef typename BOOST_MOVE_IMPDEF(base_t::const_reverse_iterator) const_reverse_iterator; typedef std::pair nonconst_value_type; - typedef BOOST_CONTAINER_IMPDEF(movable_value_type_impl) movable_value_type; + typedef BOOST_MOVE_IMPDEF(movable_value_type_impl) movable_value_type; ////////////////////////////////////////////// // diff --git a/include/boost/container/set.hpp b/include/boost/container/set.hpp index bfa2a62..8160530 100644 --- a/include/boost/container/set.hpp +++ b/include/boost/container/set.hpp @@ -91,11 +91,11 @@ class set typedef typename ::boost::container::allocator_traits::size_type size_type; typedef typename ::boost::container::allocator_traits::difference_type difference_type; typedef Allocator allocator_type; - typedef typename BOOST_CONTAINER_IMPDEF(base_t::stored_allocator_type) stored_allocator_type; - typedef typename BOOST_CONTAINER_IMPDEF(base_t::iterator) iterator; - typedef typename BOOST_CONTAINER_IMPDEF(base_t::const_iterator) const_iterator; - typedef typename BOOST_CONTAINER_IMPDEF(base_t::reverse_iterator) reverse_iterator; - typedef typename BOOST_CONTAINER_IMPDEF(base_t::const_reverse_iterator) const_reverse_iterator; + typedef typename BOOST_MOVE_IMPDEF(base_t::stored_allocator_type) stored_allocator_type; + typedef typename BOOST_MOVE_IMPDEF(base_t::iterator) iterator; + typedef typename BOOST_MOVE_IMPDEF(base_t::const_iterator) const_iterator; + typedef typename BOOST_MOVE_IMPDEF(base_t::reverse_iterator) reverse_iterator; + typedef typename BOOST_MOVE_IMPDEF(base_t::const_reverse_iterator) const_reverse_iterator; ////////////////////////////////////////////// // @@ -747,11 +747,11 @@ class multiset typedef typename ::boost::container::allocator_traits::size_type size_type; typedef typename ::boost::container::allocator_traits::difference_type difference_type; typedef Allocator allocator_type; - typedef typename BOOST_CONTAINER_IMPDEF(base_t::stored_allocator_type) stored_allocator_type; - typedef typename BOOST_CONTAINER_IMPDEF(base_t::iterator) iterator; - typedef typename BOOST_CONTAINER_IMPDEF(base_t::const_iterator) const_iterator; - typedef typename BOOST_CONTAINER_IMPDEF(base_t::reverse_iterator) reverse_iterator; - typedef typename BOOST_CONTAINER_IMPDEF(base_t::const_reverse_iterator) const_reverse_iterator; + typedef typename BOOST_MOVE_IMPDEF(base_t::stored_allocator_type) stored_allocator_type; + typedef typename BOOST_MOVE_IMPDEF(base_t::iterator) iterator; + typedef typename BOOST_MOVE_IMPDEF(base_t::const_iterator) const_iterator; + typedef typename BOOST_MOVE_IMPDEF(base_t::reverse_iterator) reverse_iterator; + typedef typename BOOST_MOVE_IMPDEF(base_t::const_reverse_iterator) const_reverse_iterator; ////////////////////////////////////////////// // diff --git a/include/boost/container/slist.hpp b/include/boost/container/slist.hpp index 8fa6dd4..fb24bc9 100644 --- a/include/boost/container/slist.hpp +++ b/include/boost/container/slist.hpp @@ -195,9 +195,9 @@ class slist typedef typename ::boost::container::allocator_traits::size_type size_type; typedef typename ::boost::container::allocator_traits::difference_type difference_type; typedef Allocator allocator_type; - typedef BOOST_CONTAINER_IMPDEF(NodeAlloc) stored_allocator_type; - typedef BOOST_CONTAINER_IMPDEF(iterator_impl) iterator; - typedef BOOST_CONTAINER_IMPDEF(const_iterator_impl) const_iterator; + typedef BOOST_MOVE_IMPDEF(NodeAlloc) stored_allocator_type; + typedef BOOST_MOVE_IMPDEF(iterator_impl) iterator; + typedef BOOST_MOVE_IMPDEF(const_iterator_impl) const_iterator; public: diff --git a/include/boost/container/stable_vector.hpp b/include/boost/container/stable_vector.hpp index fb9696e..8cda00c 100644 --- a/include/boost/container/stable_vector.hpp +++ b/include/boost/container/stable_vector.hpp @@ -507,10 +507,10 @@ class stable_vector typedef typename ::boost::container::allocator_traits::difference_type difference_type; typedef Allocator allocator_type; typedef node_allocator_type stored_allocator_type; - typedef BOOST_CONTAINER_IMPDEF(iterator_impl) iterator; - typedef BOOST_CONTAINER_IMPDEF(const_iterator_impl) const_iterator; - typedef BOOST_CONTAINER_IMPDEF(boost::container::reverse_iterator) reverse_iterator; - typedef BOOST_CONTAINER_IMPDEF(boost::container::reverse_iterator) const_reverse_iterator; + typedef BOOST_MOVE_IMPDEF(iterator_impl) iterator; + typedef BOOST_MOVE_IMPDEF(const_iterator_impl) const_iterator; + typedef BOOST_MOVE_IMPDEF(boost::container::reverse_iterator) reverse_iterator; + typedef BOOST_MOVE_IMPDEF(boost::container::reverse_iterator) const_reverse_iterator; #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED private: diff --git a/include/boost/container/string.hpp b/include/boost/container/string.hpp index fe9bb7b..c2edf44 100644 --- a/include/boost/container/string.hpp +++ b/include/boost/container/string.hpp @@ -542,11 +542,11 @@ class basic_string typedef typename ::boost::container::allocator_traits::size_type size_type; typedef typename ::boost::container::allocator_traits::difference_type difference_type; typedef Allocator allocator_type; - typedef BOOST_CONTAINER_IMPDEF(allocator_type) stored_allocator_type; - typedef BOOST_CONTAINER_IMPDEF(pointer) iterator; - typedef BOOST_CONTAINER_IMPDEF(const_pointer) const_iterator; - typedef BOOST_CONTAINER_IMPDEF(boost::container::reverse_iterator) reverse_iterator; - typedef BOOST_CONTAINER_IMPDEF(boost::container::reverse_iterator) const_reverse_iterator; + typedef BOOST_MOVE_IMPDEF(allocator_type) stored_allocator_type; + typedef BOOST_MOVE_IMPDEF(pointer) iterator; + typedef BOOST_MOVE_IMPDEF(const_pointer) const_iterator; + typedef BOOST_MOVE_IMPDEF(boost::container::reverse_iterator) reverse_iterator; + typedef BOOST_MOVE_IMPDEF(boost::container::reverse_iterator) const_reverse_iterator; static const size_type npos = size_type(-1); #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED diff --git a/include/boost/container/vector.hpp b/include/boost/container/vector.hpp index 2f57970..d207a57 100644 --- a/include/boost/container/vector.hpp +++ b/include/boost/container/vector.hpp @@ -601,14 +601,14 @@ class vector typedef Allocator allocator_type; typedef Allocator stored_allocator_type; #if defined BOOST_CONTAINER_VECTOR_ITERATOR_IS_POINTER - typedef BOOST_CONTAINER_IMPDEF(pointer) iterator; - typedef BOOST_CONTAINER_IMPDEF(const_pointer) const_iterator; + typedef BOOST_MOVE_IMPDEF(pointer) iterator; + typedef BOOST_MOVE_IMPDEF(const_pointer) const_iterator; #else - typedef BOOST_CONTAINER_IMPDEF(iterator_impl) iterator; - typedef BOOST_CONTAINER_IMPDEF(const_iterator_impl) const_iterator; + typedef BOOST_MOVE_IMPDEF(iterator_impl) iterator; + typedef BOOST_MOVE_IMPDEF(const_iterator_impl) const_iterator; #endif - typedef BOOST_CONTAINER_IMPDEF(boost::container::reverse_iterator) reverse_iterator; - typedef BOOST_CONTAINER_IMPDEF(boost::container::reverse_iterator) const_reverse_iterator; + typedef BOOST_MOVE_IMPDEF(boost::container::reverse_iterator) reverse_iterator; + typedef BOOST_MOVE_IMPDEF(boost::container::reverse_iterator) const_reverse_iterator; #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED private: