diff --git a/bench/Jamfile.v2 b/bench/Jamfile.v2 index cc068ee..9cf993d 100644 --- a/bench/Jamfile.v2 +++ b/bench/Jamfile.v2 @@ -21,7 +21,7 @@ rule test_all for local fileb in [ glob *.cpp ] { - all_rules += [ run $(fileb) /boost/timer//boost_timer /boost/container//boost_container + all_rules += [ run $(fileb) /boost/container//boost_container /boost/timer//boost_timer : # additional args : # test-files : # requirements diff --git a/bench/bench_adaptive_node_pool.cpp b/bench/bench_adaptive_node_pool.cpp index 048e1b3..e9a3681 100644 --- a/bench/bench_adaptive_node_pool.cpp +++ b/bench/bench_adaptive_node_pool.cpp @@ -221,28 +221,28 @@ void list_test_template(std::size_t num_iterations, std::size_t num_elements, bo } //Release node_allocator cache - typedef boost::container::container_detail::shared_node_pool + typedef boost::container::dtl::shared_node_pool < (2*sizeof(void*)+sizeof(int)) , AdPoolAlignOnlyV2::nodes_per_block> shared_node_pool_t; - boost::container::container_detail::singleton_default + boost::container::dtl::singleton_default ::instance().purge_blocks(); //Release adaptive_pool cache - typedef boost::container::container_detail::shared_adaptive_node_pool + typedef boost::container::dtl::shared_adaptive_node_pool < (2*sizeof(void*)+sizeof(int)) , AdPool2PercentV2::nodes_per_block , AdPool2PercentV2::max_free_blocks , AdPool2PercentV2::overhead_percent> shared_adaptive_pool_plus_t; - boost::container::container_detail::singleton_default + boost::container::dtl::singleton_default ::instance().deallocate_free_blocks(); //Release adaptive_pool cache - typedef boost::container::container_detail::shared_adaptive_node_pool + typedef boost::container::dtl::shared_adaptive_node_pool < (2*sizeof(void*)+sizeof(int)) , AdPool2PercentV2::nodes_per_block , AdPool2PercentV2::max_free_blocks , 0u> shared_adaptive_pool_plus_align_only_t; - boost::container::container_detail::singleton_default + boost::container::dtl::singleton_default ::instance().deallocate_free_blocks(); //Release dlmalloc memory bc::dlmalloc_trim(0); diff --git a/bench/bench_alloc_shrink_to_fit.cpp b/bench/bench_alloc_shrink_to_fit.cpp index 271d770..687d76d 100644 --- a/bench/bench_alloc_shrink_to_fit.cpp +++ b/bench/bench_alloc_shrink_to_fit.cpp @@ -84,8 +84,8 @@ void vector_test_template(unsigned int num_iterations, unsigned int num_elements timer.resume(); #ifndef NDEBUG - typedef bc::container_detail::integral_constant - ::value> alloc_version; + typedef bc::dtl::integral_constant + ::value> alloc_version; #endif for(unsigned int r = 0; r != num_iterations; ++r){ diff --git a/bench/detail/varray.hpp b/bench/detail/varray.hpp index 4553c47..ca29c14 100644 --- a/bench/detail/varray.hpp +++ b/bench/detail/varray.hpp @@ -50,7 +50,7 @@ * @defgroup varray_non_member varray non-member functions */ -namespace boost { namespace container { namespace container_detail { +namespace boost { namespace container { namespace dtl { // Forward declaration template @@ -220,14 +220,14 @@ struct varray_traits template > class varray { - typedef container_detail::varray_traits< + typedef dtl::varray_traits< Value, Capacity, Strategy > vt; typedef typename vt::error_handler errh; typedef typename aligned_storage< sizeof(Value[Capacity]), - boost::container::container_detail::alignment_of::value + boost::container::dtl::alignment_of::value >::type aligned_storage_type; template @@ -2235,7 +2235,7 @@ inline void swap(varray & x, varray & y) x.swap(y); } -}}} // namespace boost::container::container_detail +}}} // namespace boost::container::dtl #include diff --git a/bench/detail/varray_concept.hpp b/bench/detail/varray_concept.hpp index 6f044a9..94d19bd 100644 --- a/bench/detail/varray_concept.hpp +++ b/bench/detail/varray_concept.hpp @@ -12,7 +12,7 @@ #include -namespace boost { namespace container { namespace container_detail { namespace concept { +namespace boost { namespace container { namespace dtl { namespace concept { /** * VArrayStrategyConcept @@ -55,6 +55,6 @@ public : #endif }; -}}}} // namespace boost::container::container_detail::concept +}}}} // namespace boost::container::dtl::concept #endif //BOOST_CONTAINER_VARRAY_CONCEPT_HPP diff --git a/bench/detail/varray_util.hpp b/bench/detail/varray_util.hpp index 9eac6a8..043e9e9 100644 --- a/bench/detail/varray_util.hpp +++ b/bench/detail/varray_util.hpp @@ -41,10 +41,10 @@ namespace boost { namespace container { namespace varray_detail { -namespace bcd = ::boost::container::container_detail; +namespace bcd = ::boost::container::dtl; template -struct are_elements_contiguous : boost::container::container_detail::is_pointer +struct are_elements_contiguous : boost::container::dtl::is_pointer {}; #if defined(BOOST_CONTAINER_VARRAY_ENABLE_VECTORS_OPTIMIZATION) && !defined(BOOST_NO_EXCEPTIONS) @@ -176,7 +176,7 @@ inline O copy_dispatch(I first, I last, O dst, bcd::true_type const& /*use_memmo { typedef typename ::boost::container::iterator_traits::value_type value_type; const std::size_t d = boost::container::iterator_distance(first, last); - ::memmove(boost::container::container_detail::addressof(*dst), boost::container::container_detail::addressof(*first), sizeof(value_type) * d); + ::memmove(boost::container::dtl::addressof(*dst), boost::container::dtl::addressof(*first), sizeof(value_type) * d); return dst + d; } @@ -206,7 +206,7 @@ O uninitialized_copy_dispatch(I first, I last, O dst, { typedef typename ::boost::container::iterator_traits::value_type value_type; const std::size_t d = boost::container::iterator_distance(first, last); - ::memcpy(boost::container::container_detail::addressof(*dst), boost::container::container_detail::addressof(*first), sizeof(value_type) * d); + ::memcpy(boost::container::dtl::addressof(*dst), boost::container::dtl::addressof(*first), sizeof(value_type) * d); return dst + d; } @@ -238,7 +238,7 @@ O uninitialized_move_dispatch(I first, I last, O dst, { typedef typename ::boost::container::iterator_traits::value_type value_type; const std::size_t d = boost::container::iterator_distance(first, last); - ::memcpy(boost::container::container_detail::addressof(*dst), boost::container::container_detail::addressof(*first), sizeof(value_type) * d); + ::memcpy(boost::container::dtl::addressof(*dst), boost::container::dtl::addressof(*first), sizeof(value_type) * d); return dst + d; } @@ -255,7 +255,7 @@ O uninitialized_move_dispatch(I first, I last, O dst, { typedef typename boost::container::iterator_traits::value_type value_type; for (; first != last; ++first, ++o ) - new (boost::container::container_detail::addressof(*o)) value_type(boost::move(*first)); + new (boost::container::dtl::addressof(*o)) value_type(boost::move(*first)); } BOOST_CATCH(...) { @@ -289,7 +289,7 @@ O move_dispatch(I first, I last, O dst, { typedef typename ::boost::container::iterator_traits::value_type value_type; const std::size_t d = boost::container::iterator_distance(first, last); - ::memmove(boost::container::container_detail::addressof(*dst), boost::container::container_detail::addressof(*first), sizeof(value_type)*d ); + ::memmove(boost::container::dtl::addressof(*dst), boost::container::dtl::addressof(*first), sizeof(value_type)*d ); return dst + d; } @@ -322,7 +322,7 @@ BDO move_backward_dispatch(BDI first, BDI last, BDO dst, typedef typename ::boost::container::iterator_traits::value_type value_type; const std::size_t d = boost::container::iterator_distance(first, last); BDO foo(dst - d); - ::memmove(boost::container::container_detail::addressof(*foo), boost::container::container_detail::addressof(*first), sizeof(value_type) * d); + ::memmove(boost::container::dtl::addressof(*foo), boost::container::dtl::addressof(*first), sizeof(value_type) * d); return foo; } @@ -419,7 +419,7 @@ void uninitialized_fill_dispatch(I first, I last, { typedef typename ::boost::container::iterator_traits::value_type value_type; for ( ; first != last ; ++first ) - new (boost::container::container_detail::addressof(*first)) value_type(); + new (boost::container::dtl::addressof(*first)) value_type(); } template @@ -434,7 +434,7 @@ void uninitialized_fill_dispatch(I first, I last, BOOST_TRY { for ( ; it != last ; ++it ) - new (boost::container::container_detail::addressof(*it)) value_type(); // may throw + new (boost::container::dtl::addressof(*it)) value_type(); // may throw } BOOST_CATCH(...) { @@ -466,7 +466,7 @@ inline void construct_dispatch(bcd::false_type const& /*dont_init*/, I pos) { typedef typename ::boost::container::iterator_traits::value_type value_type; - new (static_cast(::boost::container::container_detail::addressof(*pos))) value_type(); // may throw + new (static_cast(::boost::container::dtl::addressof(*pos))) value_type(); // may throw } template @@ -487,7 +487,7 @@ template inline void construct_dispatch(I pos, V const& v, bcd::true_type const& /*use_memcpy*/) { - ::memcpy(boost::container::container_detail::addressof(*pos), boost::container::container_detail::addressof(v), sizeof(V)); + ::memcpy(boost::container::dtl::addressof(*pos), boost::container::dtl::addressof(v), sizeof(V)); } template @@ -496,7 +496,7 @@ void construct_dispatch(I pos, P const& p, bcd::false_type const& /*use_memcpy*/) { typedef typename ::boost::container::iterator_traits::value_type V; - new (static_cast(boost::container::container_detail::addressof(*pos))) V(p); // may throw + new (static_cast(boost::container::dtl::addressof(*pos))) V(p); // may throw } template @@ -517,7 +517,7 @@ inline void construct(DisableTrivialInit const&, I pos, BOOST_RV_REF(P) p) { typedef typename ::boost::container::iterator_traits::value_type V; - new (static_cast(boost::container::container_detail::addressof(*pos))) V(::boost::move(p)); // may throw + new (static_cast(boost::container::dtl::addressof(*pos))) V(::boost::move(p)); // may throw } // Needed by emplace_back() and emplace() @@ -532,7 +532,7 @@ void construct(DisableTrivialInit const&, BOOST_FWD_REF(Args) ...args) { typedef typename ::boost::container::iterator_traits::value_type V; - new (static_cast(boost::container::container_detail::addressof(*pos))) V(::boost::forward(args)...); // may throw + new (static_cast(boost::container::dtl::addressof(*pos))) V(::boost::forward(args)...); // may throw } #else // !BOOST_NO_CXX11_VARIADIC_TEMPLATES @@ -546,7 +546,7 @@ template ::value_type V;\ - new (static_cast(boost::container::container_detail::addressof(*pos)))\ + new (static_cast(boost::container::dtl::addressof(*pos)))\ V(::boost::forward

(p) BOOST_MOVE_I##N BOOST_MOVE_FWD##N); /*may throw*/\ } BOOST_MOVE_ITERATE_1TO9(BOOST_CONTAINER_VARRAY_UTIL_CONSTRUCT_CODE) @@ -562,7 +562,7 @@ inline void assign_dispatch(I pos, V const& v, bcd::true_type const& /*use_memcpy*/) { - ::memcpy(boost::container::container_detail::addressof(*pos), boost::container::container_detail::addressof(v), sizeof(V)); + ::memcpy(boost::container::dtl::addressof(*pos), boost::container::dtl::addressof(v), sizeof(V)); } template diff --git a/bench/varray.hpp b/bench/varray.hpp index caac4af..98b7100 100644 --- a/bench/varray.hpp +++ b/bench/varray.hpp @@ -54,9 +54,9 @@ namespace boost { namespace container { */ template class varray - : public container_detail::varray + : public dtl::varray { - typedef container_detail::varray base_t; + typedef dtl::varray base_t; BOOST_COPYABLE_AND_MOVABLE(varray) @@ -238,7 +238,7 @@ public: //! Linear O(N). template varray(BOOST_RV_REF_2_TEMPL_ARGS(varray, value_type, C) other) - : base_t(boost::move(static_cast&>(other))) + : base_t(boost::move(static_cast&>(other))) {} //! @brief Move assignment. Moves Values stored in the other varray to this one. @@ -272,7 +272,7 @@ public: template varray & operator=(BOOST_RV_REF_2_TEMPL_ARGS(varray, value_type, C) other) { - base_t::operator=(boost::move(static_cast&>(other))); + base_t::operator=(boost::move(static_cast&>(other))); return *this; } diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index 58ebcdd..0ba75ac 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -21,7 +21,7 @@ rule test_all for local fileb in [ glob doc_*.cpp ] { - all_rules += [ run $(fileb) /boost/container//boost_container /boost/timer//boost_timer + all_rules += [ run $(fileb) /boost/container//boost_container : # additional args : # test-files : # requirements diff --git a/include/boost/container/adaptive_pool.hpp b/include/boost/container/adaptive_pool.hpp index ac14fb3..900806a 100644 --- a/include/boost/container/adaptive_pool.hpp +++ b/include/boost/container/adaptive_pool.hpp @@ -83,19 +83,19 @@ class adaptive_pool typedef T * pointer; typedef const T * const_pointer; typedef typename ::boost::container:: - container_detail::unvoid_ref::type reference; + dtl::unvoid_ref::type reference; typedef typename ::boost::container:: - container_detail::unvoid_ref::type const_reference; + dtl::unvoid_ref::type const_reference; typedef std::size_t size_type; typedef std::ptrdiff_t difference_type; - typedef boost::container::container_detail:: + typedef boost::container::dtl:: version_type version; #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED - typedef boost::container::container_detail:: + typedef boost::container::dtl:: basic_multiallocation_chain multiallocation_chain_void; - typedef boost::container::container_detail:: + typedef boost::container::dtl:: transform_multiallocation_chain multiallocation_chain; #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED @@ -156,9 +156,9 @@ class adaptive_pool boost::container::throw_bad_alloc(); if(Version == 1 && count == 1){ - typedef typename container_detail::shared_adaptive_node_pool + typedef typename dtl::shared_adaptive_node_pool shared_pool_t; - typedef container_detail::singleton_default singleton_t; + typedef dtl::singleton_default singleton_t; return pointer(static_cast(singleton_t::instance().allocate_node())); } else{ @@ -172,9 +172,9 @@ class adaptive_pool { (void)count; if(Version == 1 && count == 1){ - typedef container_detail::shared_adaptive_node_pool + typedef dtl::shared_adaptive_node_pool shared_pool_t; - typedef container_detail::singleton_default singleton_t; + typedef dtl::singleton_default singleton_t; singleton_t::instance().deallocate_node(ptr); } else{ @@ -203,9 +203,9 @@ class adaptive_pool //!Throws bad_alloc if there is no enough memory pointer allocate_one() { - typedef container_detail::shared_adaptive_node_pool + typedef dtl::shared_adaptive_node_pool shared_pool_t; - typedef container_detail::singleton_default singleton_t; + typedef dtl::singleton_default singleton_t; return (pointer)singleton_t::instance().allocate_node(); } @@ -213,9 +213,9 @@ class adaptive_pool //!Elements must be individually deallocated with deallocate_one() void allocate_individual(std::size_t num_elements, multiallocation_chain &chain) { - typedef container_detail::shared_adaptive_node_pool + typedef dtl::shared_adaptive_node_pool shared_pool_t; - typedef container_detail::singleton_default singleton_t; + typedef dtl::singleton_default singleton_t; singleton_t::instance().allocate_nodes(num_elements, static_cast(chain)); //typename shared_pool_t::multiallocation_chain ch; //singleton_t::instance().allocate_nodes(num_elements, ch); @@ -228,17 +228,17 @@ class adaptive_pool //!with other functions different from allocate_one(). Never throws void deallocate_one(pointer p) BOOST_NOEXCEPT_OR_NOTHROW { - typedef container_detail::shared_adaptive_node_pool + typedef dtl::shared_adaptive_node_pool shared_pool_t; - typedef container_detail::singleton_default singleton_t; + typedef dtl::singleton_default singleton_t; singleton_t::instance().deallocate_node(p); } void deallocate_individual(multiallocation_chain &chain) BOOST_NOEXCEPT_OR_NOTHROW { - typedef container_detail::shared_adaptive_node_pool + typedef dtl::shared_adaptive_node_pool shared_pool_t; - typedef container_detail::singleton_default singleton_t; + typedef dtl::singleton_default singleton_t; //typename shared_pool_t::multiallocation_chain ch(&*chain.begin(), &*chain.last(), chain.size()); //singleton_t::instance().deallocate_nodes(ch); singleton_t::instance().deallocate_nodes(chain); @@ -297,9 +297,9 @@ class adaptive_pool //!Deallocates all free blocks of the pool static void deallocate_free_blocks() BOOST_NOEXCEPT_OR_NOTHROW { - typedef container_detail::shared_adaptive_node_pool + typedef dtl::shared_adaptive_node_pool shared_pool_t; - typedef container_detail::singleton_default singleton_t; + typedef dtl::singleton_default singleton_t; singleton_t::instance().deallocate_free_blocks(); } diff --git a/include/boost/container/allocator.hpp b/include/boost/container/allocator.hpp index 9b9268f..c0deb0a 100644 --- a/include/boost/container/allocator.hpp +++ b/include/boost/container/allocator.hpp @@ -49,11 +49,11 @@ class allocator typedef const int & const_reference; typedef std::size_t size_type; typedef std::ptrdiff_t difference_type; - typedef boost::container::container_detail:: + typedef boost::container::dtl:: version_type version; #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED - typedef boost::container::container_detail:: + typedef boost::container::dtl:: basic_multiallocation_chain multiallocation_chain; #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED @@ -133,14 +133,14 @@ class allocator typedef std::size_t size_type; typedef std::ptrdiff_t difference_type; - typedef boost::container::container_detail:: + typedef boost::container::dtl:: version_type version; #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED - typedef boost::container::container_detail:: + typedef boost::container::dtl:: basic_multiallocation_chain void_multiallocation_chain; - typedef boost::container::container_detail:: + typedef boost::container::dtl:: transform_multiallocation_chain multiallocation_chain; #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED diff --git a/include/boost/container/allocator_traits.hpp b/include/boost/container/allocator_traits.hpp index b08f601..af32f18 100644 --- a/include/boost/container/allocator_traits.hpp +++ b/include/boost/container/allocator_traits.hpp @@ -50,21 +50,21 @@ #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_FUNCNAME allocate -#define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_BEG namespace boost { namespace container { namespace container_detail { +#define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_BEG namespace boost { namespace container { namespace dtl { #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_END }}} #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_MIN 2 #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_MAX 2 #include #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_FUNCNAME destroy -#define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_BEG namespace boost { namespace container { namespace container_detail { +#define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_BEG namespace boost { namespace container { namespace dtl { #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_END }}} #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_MIN 1 #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_MAX 1 #include #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_FUNCNAME construct -#define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_BEG namespace boost { namespace container { namespace container_detail { +#define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_BEG namespace boost { namespace container { namespace dtl { #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_END }}} #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_MIN 1 #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_MAX 9 @@ -87,7 +87,7 @@ BOOST_INTRUSIVE_HAS_STATIC_MEMBER_FUNC_SIGNATURE(has_select_on_container_copy_co } //namespace allocator_traits_detail { -namespace container_detail { +namespace dtl { //workaround needed for C++03 compilers with no construct() //supporting rvalue references @@ -121,7 +121,7 @@ BOOST_INTRUSIVE_INSTANTIATE_DEFAULT_TYPE_TMPLT(is_always_equal) BOOST_INTRUSIVE_INSTANTIATE_DEFAULT_TYPE_TMPLT(difference_type) BOOST_INTRUSIVE_INSTANTIATE_DEFAULT_TYPE_TMPLT(is_partially_propagable) -} //namespace container_detail { +} //namespace dtl { #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED @@ -196,59 +196,59 @@ struct allocator_traits { typedef see_documentation type; }; #else //pointer - typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT(boost::container::container_detail::, Allocator, + typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT(boost::container::dtl::, Allocator, pointer, value_type*) pointer; //const_pointer - typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_EVAL_DEFAULT(boost::container::container_detail::, Allocator, + typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_EVAL_DEFAULT(boost::container::dtl::, Allocator, const_pointer, typename boost::intrusive::pointer_traits::template rebind_pointer) const_pointer; //reference - typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT(boost::container::container_detail::, Allocator, - reference, typename container_detail::unvoid_ref::type) + typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT(boost::container::dtl::, Allocator, + reference, typename dtl::unvoid_ref::type) reference; //const_reference - typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT(boost::container::container_detail::, Allocator, - const_reference, typename container_detail::unvoid_ref::type) + typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT(boost::container::dtl::, Allocator, + const_reference, typename dtl::unvoid_ref::type) const_reference; //void_pointer - typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_EVAL_DEFAULT(boost::container::container_detail::, Allocator, + typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_EVAL_DEFAULT(boost::container::dtl::, Allocator, void_pointer, typename boost::intrusive::pointer_traits::template rebind_pointer) void_pointer; //const_void_pointer - typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_EVAL_DEFAULT(boost::container::container_detail::, Allocator, + typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_EVAL_DEFAULT(boost::container::dtl::, Allocator, const_void_pointer, typename boost::intrusive::pointer_traits::template rebind_pointer) const_void_pointer; //difference_type - typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT(boost::container::container_detail::, Allocator, + typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT(boost::container::dtl::, Allocator, difference_type, std::ptrdiff_t) difference_type; //size_type - typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT(boost::container::container_detail::, Allocator, + typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT(boost::container::dtl::, Allocator, size_type, std::size_t) size_type; //propagate_on_container_copy_assignment - typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT(boost::container::container_detail::, Allocator, - propagate_on_container_copy_assignment, container_detail::false_type) + typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT(boost::container::dtl::, Allocator, + propagate_on_container_copy_assignment, dtl::false_type) propagate_on_container_copy_assignment; //propagate_on_container_move_assignment - typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT(boost::container::container_detail::, Allocator, - propagate_on_container_move_assignment, container_detail::false_type) + typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT(boost::container::dtl::, Allocator, + propagate_on_container_move_assignment, dtl::false_type) propagate_on_container_move_assignment; //propagate_on_container_swap - typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT(boost::container::container_detail::, Allocator, - propagate_on_container_swap, container_detail::false_type) + typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT(boost::container::dtl::, Allocator, + propagate_on_container_swap, dtl::false_type) propagate_on_container_swap; //is_always_equal - typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT(boost::container::container_detail::, Allocator, - is_always_equal, container_detail::is_empty) + typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT(boost::container::dtl::, Allocator, + is_always_equal, dtl::is_empty) is_always_equal; //is_partially_propagable - typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT(boost::container::container_detail::, Allocator, - is_partially_propagable, container_detail::false_type) + typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT(boost::container::dtl::, Allocator, + is_partially_propagable, dtl::false_type) is_partially_propagable; //rebind_alloc & rebind_traits @@ -302,10 +302,10 @@ struct allocator_traits //! otherwise, invokes a.allocate(n) BOOST_CONTAINER_FORCEINLINE static pointer allocate(Allocator &a, size_type n, const_void_pointer p) { - const bool value = boost::container::container_detail:: + const bool value = boost::container::dtl:: has_member_function_callable_with_allocate ::value; - container_detail::bool_ flag; + dtl::bool_ flag; return allocator_traits::priv_allocate(flag, a, n, p); } @@ -315,10 +315,10 @@ struct allocator_traits BOOST_CONTAINER_FORCEINLINE static void destroy(Allocator &a, T*p) BOOST_NOEXCEPT_OR_NOTHROW { typedef T* destroy_pointer; - const bool value = boost::container::container_detail:: + const bool value = boost::container::dtl:: has_member_function_callable_with_destroy ::value; - container_detail::bool_ flag; + dtl::bool_ flag; allocator_traits::priv_destroy(flag, a, p); } @@ -327,21 +327,21 @@ struct allocator_traits BOOST_CONTAINER_FORCEINLINE static size_type max_size(const Allocator &a) BOOST_NOEXCEPT_OR_NOTHROW { const bool value = allocator_traits_detail::has_max_size::value; - container_detail::bool_ flag; + dtl::bool_ flag; return allocator_traits::priv_max_size(flag, a); } //! Returns: a.select_on_container_copy_construction() if that expression is well-formed; //! otherwise, a. BOOST_CONTAINER_FORCEINLINE static BOOST_CONTAINER_DOC1ST(Allocator, - typename container_detail::if_c + typename dtl::if_c < allocator_traits_detail::has_select_on_container_copy_construction::value BOOST_MOVE_I Allocator BOOST_MOVE_I const Allocator & >::type) select_on_container_copy_construction(const Allocator &a) { const bool value = allocator_traits_detail::has_select_on_container_copy_construction ::value; - container_detail::bool_ flag; + dtl::bool_ flag; return allocator_traits::priv_select_on_container_copy_construction(flag, a); } @@ -352,11 +352,11 @@ struct allocator_traits BOOST_CONTAINER_FORCEINLINE static void construct(Allocator & a, T* p, BOOST_FWD_REF(Args)... args) { static const bool value = ::boost::move_detail::and_ - < container_detail::is_not_std_allocator - , boost::container::container_detail::has_member_function_callable_with_construct + < dtl::is_not_std_allocator + , boost::container::dtl::has_member_function_callable_with_construct < Allocator, T*, Args... > >::value; - container_detail::bool_ flag; + dtl::bool_ flag; allocator_traits::priv_construct(flag, a, p, ::boost::forward(args)...); } #endif @@ -365,7 +365,7 @@ struct allocator_traits //! false. BOOST_CONTAINER_FORCEINLINE static bool storage_is_unpropagable(const Allocator &a, pointer p) BOOST_NOEXCEPT_OR_NOTHROW { - container_detail::bool_ flag; + dtl::bool_ flag; return allocator_traits::priv_storage_is_unpropagable(flag, a, p); } @@ -373,45 +373,45 @@ struct allocator_traits //! a == b. BOOST_CONTAINER_FORCEINLINE static bool equal(const Allocator &a, const Allocator &b) BOOST_NOEXCEPT_OR_NOTHROW { - container_detail::bool_ flag; + dtl::bool_ flag; return allocator_traits::priv_equal(flag, a, b); } #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) private: - BOOST_CONTAINER_FORCEINLINE static pointer priv_allocate(container_detail::true_type, Allocator &a, size_type n, const_void_pointer p) + BOOST_CONTAINER_FORCEINLINE static pointer priv_allocate(dtl::true_type, Allocator &a, size_type n, const_void_pointer p) { return a.allocate(n, p); } - BOOST_CONTAINER_FORCEINLINE static pointer priv_allocate(container_detail::false_type, Allocator &a, size_type n, const_void_pointer) + BOOST_CONTAINER_FORCEINLINE static pointer priv_allocate(dtl::false_type, Allocator &a, size_type n, const_void_pointer) { return a.allocate(n); } template - BOOST_CONTAINER_FORCEINLINE static void priv_destroy(container_detail::true_type, Allocator &a, T* p) BOOST_NOEXCEPT_OR_NOTHROW + BOOST_CONTAINER_FORCEINLINE static void priv_destroy(dtl::true_type, Allocator &a, T* p) BOOST_NOEXCEPT_OR_NOTHROW { a.destroy(p); } template - BOOST_CONTAINER_FORCEINLINE static void priv_destroy(container_detail::false_type, Allocator &, T* p) BOOST_NOEXCEPT_OR_NOTHROW + BOOST_CONTAINER_FORCEINLINE static void priv_destroy(dtl::false_type, Allocator &, T* p) BOOST_NOEXCEPT_OR_NOTHROW { p->~T(); (void)p; } - BOOST_CONTAINER_FORCEINLINE static size_type priv_max_size(container_detail::true_type, const Allocator &a) BOOST_NOEXCEPT_OR_NOTHROW + BOOST_CONTAINER_FORCEINLINE static size_type priv_max_size(dtl::true_type, const Allocator &a) BOOST_NOEXCEPT_OR_NOTHROW { return a.max_size(); } - BOOST_CONTAINER_FORCEINLINE static size_type priv_max_size(container_detail::false_type, const Allocator &) BOOST_NOEXCEPT_OR_NOTHROW + BOOST_CONTAINER_FORCEINLINE static size_type priv_max_size(dtl::false_type, const Allocator &) BOOST_NOEXCEPT_OR_NOTHROW { return size_type(-1)/sizeof(value_type); } - BOOST_CONTAINER_FORCEINLINE static Allocator priv_select_on_container_copy_construction(container_detail::true_type, const Allocator &a) + BOOST_CONTAINER_FORCEINLINE static Allocator priv_select_on_container_copy_construction(dtl::true_type, const Allocator &a) { return a.select_on_container_copy_construction(); } - BOOST_CONTAINER_FORCEINLINE static const Allocator &priv_select_on_container_copy_construction(container_detail::false_type, const Allocator &a) BOOST_NOEXCEPT_OR_NOTHROW + BOOST_CONTAINER_FORCEINLINE static const Allocator &priv_select_on_container_copy_construction(dtl::false_type, const Allocator &a) BOOST_NOEXCEPT_OR_NOTHROW { return a; } #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) template - BOOST_CONTAINER_FORCEINLINE static void priv_construct(container_detail::true_type, Allocator &a, T *p, BOOST_FWD_REF(Args) ...args) + BOOST_CONTAINER_FORCEINLINE static void priv_construct(dtl::true_type, Allocator &a, T *p, BOOST_FWD_REF(Args) ...args) { a.construct( p, ::boost::forward(args)...); } template - BOOST_CONTAINER_FORCEINLINE static void priv_construct(container_detail::false_type, Allocator &, T *p, BOOST_FWD_REF(Args) ...args) + BOOST_CONTAINER_FORCEINLINE static void priv_construct(dtl::false_type, Allocator &, T *p, BOOST_FWD_REF(Args) ...args) { ::new((void*)p, boost_container_new_t()) T(::boost::forward(args)...); } #else // #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) public: @@ -421,11 +421,11 @@ struct allocator_traits BOOST_CONTAINER_FORCEINLINE static void construct(Allocator &a, T *p BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\ {\ static const bool value = ::boost::move_detail::and_ \ - < container_detail::is_not_std_allocator \ - , boost::container::container_detail::has_member_function_callable_with_construct \ + < dtl::is_not_std_allocator \ + , boost::container::dtl::has_member_function_callable_with_construct \ < Allocator, T* BOOST_MOVE_I##N BOOST_MOVE_FWD_T##N > \ >::value; \ - container_detail::bool_ flag;\ + dtl::bool_ flag;\ (priv_construct)(flag, a, p BOOST_MOVE_I##N BOOST_MOVE_FWD##N);\ }\ // @@ -438,11 +438,11 @@ struct allocator_traits ///////////////////////////////// #define BOOST_CONTAINER_ALLOCATOR_TRAITS_PRIV_CONSTRUCT_IMPL(N) \ template\ - BOOST_CONTAINER_FORCEINLINE static void priv_construct(container_detail::true_type, Allocator &a, T *p BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\ + BOOST_CONTAINER_FORCEINLINE static void priv_construct(dtl::true_type, Allocator &a, T *p BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\ { a.construct( p BOOST_MOVE_I##N BOOST_MOVE_FWD##N ); }\ \ template\ - BOOST_CONTAINER_FORCEINLINE static void priv_construct(container_detail::false_type, Allocator &, T *p BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\ + BOOST_CONTAINER_FORCEINLINE static void priv_construct(dtl::false_type, Allocator &, T *p BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\ { ::new((void*)p, boost_container_new_t()) T(BOOST_MOVE_FWD##N); }\ // BOOST_MOVE_ITERATE_0TO8(BOOST_CONTAINER_ALLOCATOR_TRAITS_PRIV_CONSTRUCT_IMPL) @@ -451,19 +451,19 @@ struct allocator_traits #endif // #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) template - BOOST_CONTAINER_FORCEINLINE static void priv_construct(container_detail::false_type, Allocator &, T *p, const ::boost::container::default_init_t&) + BOOST_CONTAINER_FORCEINLINE static void priv_construct(dtl::false_type, Allocator &, T *p, const ::boost::container::default_init_t&) { ::new((void*)p, boost_container_new_t()) T; } - BOOST_CONTAINER_FORCEINLINE static bool priv_storage_is_unpropagable(container_detail::true_type, const Allocator &a, pointer p) + BOOST_CONTAINER_FORCEINLINE static bool priv_storage_is_unpropagable(dtl::true_type, const Allocator &a, pointer p) { return a.storage_is_unpropagable(p); } - BOOST_CONTAINER_FORCEINLINE static bool priv_storage_is_unpropagable(container_detail::false_type, const Allocator &, pointer) + BOOST_CONTAINER_FORCEINLINE static bool priv_storage_is_unpropagable(dtl::false_type, const Allocator &, pointer) { return false; } - BOOST_CONTAINER_FORCEINLINE static bool priv_equal(container_detail::true_type, const Allocator &, const Allocator &) + BOOST_CONTAINER_FORCEINLINE static bool priv_equal(dtl::true_type, const Allocator &, const Allocator &) { return true; } - BOOST_CONTAINER_FORCEINLINE static bool priv_equal(container_detail::false_type, const Allocator &a, const Allocator &b) + BOOST_CONTAINER_FORCEINLINE static bool priv_equal(dtl::false_type, const Allocator &a, const Allocator &b) { return a == b; } #endif //#if defined(BOOST_CONTAINER_DOXYGEN_INVOKED) diff --git a/include/boost/container/container_fwd.hpp b/include/boost/container/container_fwd.hpp index e85a6ce..2ad5967 100644 --- a/include/boost/container/container_fwd.hpp +++ b/include/boost/container/container_fwd.hpp @@ -67,7 +67,7 @@ namespace detail{ //Create namespace to avoid compilation errors }}} -namespace boost{ namespace container{ namespace container_detail{ +namespace boost{ namespace container{ namespace dtl{ namespace bi = boost::intrusive; namespace bid = boost::intrusive::detail; }}} diff --git a/include/boost/container/deque.hpp b/include/boost/container/deque.hpp index b838f6e..9565144 100644 --- a/include/boost/container/deque.hpp +++ b/include/boost/container/deque.hpp @@ -68,7 +68,7 @@ template struct deque_value_traits { typedef T value_type; - static const bool trivial_dctr = container_detail::is_trivially_destructible::value; + static const bool trivial_dctr = dtl::is_trivially_destructible::value; static const bool trivial_dctr_after_move = ::boost::has_trivial_destructor_after_move::value; }; @@ -82,7 +82,7 @@ struct deque_buf_size static const std::size_t value = sizeof_t < min_size ? (min_size/sizeof_t) : std::size_t(1); }; -namespace container_detail { +namespace dtl { // Class invariants: // For any nonsingular iterator i: @@ -273,7 +273,7 @@ class deque_iterator { return x += n; } }; -} //namespace container_detail { +} //namespace dtl { // Deque base class. It has two purposes. First, its constructor // and destructor allocate (but don't initialize) storage. This makes @@ -323,8 +323,8 @@ class deque_base void priv_deallocate_map(ptr_alloc_ptr p, size_type n) BOOST_NOEXCEPT_OR_NOTHROW { this->ptr_alloc().deallocate(p, n); } - typedef container_detail::deque_iterator iterator; - typedef container_detail::deque_iterator const_iterator; + typedef dtl::deque_iterator iterator; + typedef dtl::deque_iterator const_iterator; deque_base(size_type num_elements, const allocator_type& a) : members_(a) @@ -369,7 +369,7 @@ class deque_base // if(num_elements){ size_type num_nodes = num_elements / s_buffer_size() + 1; - this->members_.m_map_size = container_detail::max_value((size_type) InitialMapSize, num_nodes + 2); + this->members_.m_map_size = dtl::max_value((size_type) InitialMapSize, num_nodes + 2); this->members_.m_map = this->priv_allocate_map(this->members_.m_map_size); ptr_alloc_ptr nstart = this->members_.m_map + (this->members_.m_map_size - num_nodes) / 2; @@ -535,7 +535,7 @@ class deque : protected deque_base //! Throws: If allocator_type's default constructor throws. //! //! Complexity: Constant. - deque() BOOST_NOEXCEPT_IF(container_detail::is_nothrow_default_constructible::value) + deque() BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible::value) : Base() {} @@ -558,7 +558,7 @@ class deque : protected deque_base explicit deque(size_type n) : Base(n, allocator_type()) { - container_detail::insert_value_initialized_n_proxy proxy; + dtl::insert_value_initialized_n_proxy proxy; proxy.uninitialized_copy_n_and_update(this->alloc(), this->begin(), n); //deque_base will deallocate in case of exception... } @@ -575,7 +575,7 @@ class deque : protected deque_base deque(size_type n, default_init_t) : Base(n, allocator_type()) { - container_detail::insert_default_initialized_n_proxy proxy; + dtl::insert_default_initialized_n_proxy proxy; proxy.uninitialized_copy_n_and_update(this->alloc(), this->begin(), n); //deque_base will deallocate in case of exception... } @@ -590,7 +590,7 @@ class deque : protected deque_base explicit deque(size_type n, const allocator_type &a) : Base(n, a) { - container_detail::insert_value_initialized_n_proxy proxy; + dtl::insert_value_initialized_n_proxy proxy; proxy.uninitialized_copy_n_and_update(this->alloc(), this->begin(), n); //deque_base will deallocate in case of exception... } @@ -607,7 +607,7 @@ class deque : protected deque_base deque(size_type n, default_init_t, const allocator_type &a) : Base(n, a) { - container_detail::insert_default_initialized_n_proxy proxy; + dtl::insert_default_initialized_n_proxy proxy; proxy.uninitialized_copy_n_and_update(this->alloc(), this->begin(), n); //deque_base will deallocate in case of exception... } @@ -644,7 +644,7 @@ class deque : protected deque_base template deque(InIt first, InIt last #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) - , typename container_detail::disable_if_convertible + , typename dtl::disable_if_convertible ::type * = 0 #endif ) @@ -663,7 +663,7 @@ class deque : protected deque_base template deque(InIt first, InIt last, const allocator_type& a #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) - , typename container_detail::disable_if_convertible + , typename dtl::disable_if_convertible ::type * = 0 #endif ) @@ -776,14 +776,14 @@ class deque : protected deque_base if (&x != this){ allocator_type &this_alloc = this->alloc(); const allocator_type &x_alloc = x.alloc(); - container_detail::bool_ flag; if(flag && this_alloc != x_alloc){ this->clear(); this->shrink_to_fit(); } - container_detail::assign_alloc(this->alloc(), x.alloc(), flag); - container_detail::assign_alloc(this->ptr_alloc(), x.ptr_alloc(), flag); + dtl::assign_alloc(this->alloc(), x.alloc(), flag); + dtl::assign_alloc(this->ptr_alloc(), x.ptr_alloc(), flag); this->assign(x.cbegin(), x.cend()); } return *this; @@ -806,7 +806,7 @@ class deque : protected deque_base allocator_type &x_alloc = x.alloc(); const bool propagate_alloc = allocator_traits_type:: propagate_on_container_move_assignment::value; - container_detail::bool_ flag; + dtl::bool_ flag; const bool allocators_equal = this_alloc == x_alloc; (void)allocators_equal; //Resources can be transferred if both allocators are //going to be equal after this function (either propagated or already equal) @@ -814,8 +814,8 @@ class deque : protected deque_base //Destroy objects but retain memory in case x reuses it in the future this->clear(); //Move allocator if needed - container_detail::move_alloc(this_alloc, x_alloc, flag); - container_detail::move_alloc(this->ptr_alloc(), x.ptr_alloc(), flag); + dtl::move_alloc(this_alloc, x_alloc, flag); + dtl::move_alloc(this->ptr_alloc(), x.ptr_alloc(), flag); //Nothrow swap this->swap_members(x); } @@ -863,10 +863,10 @@ class deque : protected deque_base template void assign(InIt first, InIt last #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) - , typename container_detail::disable_if_or + , typename dtl::disable_if_or < void - , container_detail::is_convertible - , container_detail::is_not_input_iterator + , dtl::is_convertible + , dtl::is_not_input_iterator >::type * = 0 #endif ) @@ -886,10 +886,10 @@ class deque : protected deque_base #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) template void assign(FwdIt first, FwdIt last - , typename container_detail::disable_if_or + , typename dtl::disable_if_or < void - , container_detail::is_convertible - , container_detail::is_input_iterator + , dtl::is_convertible + , dtl::is_input_iterator >::type * = 0 ) { @@ -1096,7 +1096,7 @@ class deque : protected deque_base this->priv_erase_last_n(len - new_size); else{ const size_type n = new_size - this->size(); - container_detail::insert_value_initialized_n_proxy proxy; + dtl::insert_value_initialized_n_proxy proxy; priv_insert_back_aux_impl(n, proxy); } } @@ -1116,7 +1116,7 @@ class deque : protected deque_base this->priv_erase_last_n(len - new_size); else{ const size_type n = new_size - this->size(); - container_detail::insert_default_initialized_n_proxy proxy; + dtl::insert_default_initialized_n_proxy proxy; priv_insert_back_aux_impl(n, proxy); } } @@ -1366,7 +1366,7 @@ class deque : protected deque_base return r; } else{ - typedef container_detail::insert_nonmovable_emplace_proxy type; + typedef dtl::insert_nonmovable_emplace_proxy type; return *this->priv_insert_front_aux_impl(1, type(boost::forward(args)...)); } } @@ -1392,7 +1392,7 @@ class deque : protected deque_base return r; } else{ - typedef container_detail::insert_nonmovable_emplace_proxy type; + typedef dtl::insert_nonmovable_emplace_proxy type; return *this->priv_insert_back_aux_impl(1, type(boost::forward(args)...)); } } @@ -1419,7 +1419,7 @@ class deque : protected deque_base return (this->end()-1); } else{ - typedef container_detail::insert_emplace_proxy type; + typedef dtl::insert_emplace_proxy type; return this->priv_insert_aux_impl(p, 1, type(boost::forward(args)...)); } } @@ -1438,7 +1438,7 @@ class deque : protected deque_base return r;\ }\ else{\ - typedef container_detail::insert_nonmovable_emplace_proxy##N\ + typedef dtl::insert_nonmovable_emplace_proxy##N\ type;\ return *priv_insert_front_aux_impl(1, type(BOOST_MOVE_FWD##N));\ }\ @@ -1455,7 +1455,7 @@ class deque : protected deque_base return r;\ }\ else{\ - typedef container_detail::insert_nonmovable_emplace_proxy##N\ + typedef dtl::insert_nonmovable_emplace_proxy##N\ type;\ return *priv_insert_back_aux_impl(1, type(BOOST_MOVE_FWD##N));\ }\ @@ -1474,7 +1474,7 @@ class deque : protected deque_base return (--this->end());\ }\ else{\ - typedef container_detail::insert_emplace_proxy_arg##N\ + typedef dtl::insert_emplace_proxy_arg##N\ type;\ return this->priv_insert_aux_impl(p, 1, type(BOOST_MOVE_FWD##N));\ }\ @@ -1583,10 +1583,10 @@ class deque : protected deque_base template iterator insert(const_iterator pos, InIt first, InIt last #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) - , typename container_detail::disable_if_or + , typename dtl::disable_if_or < void - , container_detail::is_convertible - , container_detail::is_not_input_iterator + , dtl::is_convertible + , dtl::is_not_input_iterator >::type * = 0 #endif ) @@ -1624,16 +1624,16 @@ class deque : protected deque_base template iterator insert(const_iterator p, FwdIt first, FwdIt last #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) - , typename container_detail::disable_if_or + , typename dtl::disable_if_or < void - , container_detail::is_convertible - , container_detail::is_input_iterator + , dtl::is_convertible + , dtl::is_input_iterator >::type * = 0 #endif ) { BOOST_ASSERT(this->priv_in_range_or_end(p)); - container_detail::insert_range_proxy proxy(first); + dtl::insert_range_proxy proxy(first); return priv_insert_aux_impl(p, boost::container::iterator_distance(first, last), proxy); } #endif @@ -1748,9 +1748,9 @@ class deque : protected deque_base || allocator_traits_type::is_always_equal::value) { this->swap_members(x); - container_detail::bool_ flag; - container_detail::swap_alloc(this->alloc(), x.alloc(), flag); - container_detail::swap_alloc(this->ptr_alloc(), x.ptr_alloc(), flag); + dtl::bool_ flag; + dtl::swap_alloc(this->alloc(), x.alloc(), flag); + dtl::swap_alloc(this->ptr_alloc(), x.ptr_alloc(), flag); } //! Effects: Erases all the elements of the deque. @@ -1874,7 +1874,7 @@ class deque : protected deque_base else { return priv_insert_aux_impl ( p, (size_type)1 - , container_detail::get_insert_value_proxy(::boost::forward(x))); + , dtl::get_insert_value_proxy(::boost::forward(x))); } } @@ -1889,7 +1889,7 @@ class deque : protected deque_base else{ priv_insert_aux_impl ( this->cbegin(), (size_type)1 - , container_detail::get_insert_value_proxy(::boost::forward(x))); + , dtl::get_insert_value_proxy(::boost::forward(x))); } } @@ -1904,7 +1904,7 @@ class deque : protected deque_base else{ priv_insert_aux_impl ( this->cend(), (size_type)1 - , container_detail::get_insert_value_proxy(::boost::forward(x))); + , dtl::get_insert_value_proxy(::boost::forward(x))); } } @@ -2220,7 +2220,7 @@ class deque : protected deque_base } else { size_type new_map_size = - this->members_.m_map_size + container_detail::max_value(this->members_.m_map_size, nodes_to_add) + 2; + this->members_.m_map_size + dtl::max_value(this->members_.m_map_size, nodes_to_add) + 2; index_pointer new_map = this->priv_allocate_map(new_map_size); new_nstart = new_map + (new_map_size - new_num_nodes) / 2 diff --git a/include/boost/container/detail/adaptive_node_pool.hpp b/include/boost/container/detail/adaptive_node_pool.hpp index 2069610..33bfcc9 100644 --- a/include/boost/container/detail/adaptive_node_pool.hpp +++ b/include/boost/container/detail/adaptive_node_pool.hpp @@ -37,12 +37,12 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { template struct select_private_adaptive_node_pool_impl { - typedef boost::container::container_detail:: + typedef boost::container::dtl:: private_adaptive_node_pool_impl < fake_segment_manager , unsigned(AlignOnly)*::boost::container::adaptive_pool_flag::align_only @@ -157,7 +157,7 @@ class shared_adaptive_node_pool default_mutex mutex_; }; -} //namespace container_detail { +} //namespace dtl { } //namespace container { } //namespace boost { diff --git a/include/boost/container/detail/adaptive_node_pool_impl.hpp b/include/boost/container/detail/adaptive_node_pool_impl.hpp index 54db19d..9ff4ec5 100644 --- a/include/boost/container/detail/adaptive_node_pool_impl.hpp +++ b/include/boost/container/detail/adaptive_node_pool_impl.hpp @@ -55,7 +55,7 @@ static const unsigned int address_ordered = 1u << 2u; } //namespace adaptive_pool_flag{ -namespace container_detail { +namespace dtl { template struct hdr_offset_holder_t @@ -876,7 +876,7 @@ class private_adaptive_node_pool_impl size_type m_totally_free_blocks; //Free blocks }; -} //namespace container_detail { +} //namespace dtl { } //namespace container { } //namespace boost { diff --git a/include/boost/container/detail/addressof.hpp b/include/boost/container/detail/addressof.hpp index fedbdb9..b3b8a4d 100644 --- a/include/boost/container/detail/addressof.hpp +++ b/include/boost/container/detail/addressof.hpp @@ -22,7 +22,7 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { template BOOST_CONTAINER_FORCEINLINE T* addressof(T& obj) @@ -34,7 +34,7 @@ BOOST_CONTAINER_FORCEINLINE T* addressof(T& obj) ))); } -} //namespace container_detail { +} //namespace dtl { } //namespace container { } //namespace boost { diff --git a/include/boost/container/detail/advanced_insert_int.hpp b/include/boost/container/detail/advanced_insert_int.hpp index db5e8df..be724ab 100644 --- a/include/boost/container/detail/advanced_insert_int.hpp +++ b/include/boost/container/detail/advanced_insert_int.hpp @@ -41,7 +41,7 @@ #include #include -namespace boost { namespace container { namespace container_detail { +namespace boost { namespace container { namespace dtl { template struct move_insert_range_proxy @@ -208,7 +208,7 @@ insert_copy_proxy get_insert_value_proxy(const typename boost::co return insert_copy_proxy(v); } -}}} //namespace boost { namespace container { namespace container_detail { +}}} //namespace boost { namespace container { namespace dtl { #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) @@ -217,7 +217,7 @@ insert_copy_proxy get_insert_value_proxy(const typename boost::co namespace boost { namespace container { -namespace container_detail { +namespace dtl { template struct insert_nonmovable_emplace_proxy @@ -301,7 +301,7 @@ struct insert_emplace_proxy struct insert_emplace_proxy::value_type>::type + , typename boost::container::dtl::add_const::value_type>::type > : public insert_copy_proxy { @@ -321,7 +321,7 @@ struct insert_emplace_proxy struct insert_emplace_proxy::value_type>::type & + , typename boost::container::dtl::add_const::value_type>::type & > : public insert_copy_proxy { @@ -330,7 +330,7 @@ struct insert_emplace_proxy\ @@ -437,7 +437,7 @@ struct insert_emplace_proxy_arg1 struct insert_emplace_proxy_arg1::value_type>::type + , typename boost::container::dtl::add_const::value_type>::type > : public insert_copy_proxy { @@ -457,7 +457,7 @@ struct insert_emplace_proxy_arg1 struct insert_emplace_proxy_arg1::value_type>::type & + , typename boost::container::dtl::add_const::value_type>::type & > : public insert_copy_proxy { @@ -468,7 +468,7 @@ struct insert_emplace_proxy_arg1 -inline void swap_alloc(AllocatorType &, AllocatorType &, container_detail::false_type) +inline void swap_alloc(AllocatorType &, AllocatorType &, dtl::false_type) BOOST_NOEXCEPT_OR_NOTHROW {} template -inline void swap_alloc(AllocatorType &l, AllocatorType &r, container_detail::true_type) +inline void swap_alloc(AllocatorType &l, AllocatorType &r, dtl::true_type) { boost::adl_move_swap(l, r); } template -inline void assign_alloc(AllocatorType &, const AllocatorType &, container_detail::false_type) +inline void assign_alloc(AllocatorType &, const AllocatorType &, dtl::false_type) BOOST_NOEXCEPT_OR_NOTHROW {} template -inline void assign_alloc(AllocatorType &l, const AllocatorType &r, container_detail::true_type) +inline void assign_alloc(AllocatorType &l, const AllocatorType &r, dtl::true_type) { l = r; } template -inline void move_alloc(AllocatorType &, AllocatorType &, container_detail::false_type) +inline void move_alloc(AllocatorType &, AllocatorType &, dtl::false_type) BOOST_NOEXCEPT_OR_NOTHROW {} template -inline void move_alloc(AllocatorType &l, AllocatorType &r, container_detail::true_type) +inline void move_alloc(AllocatorType &l, AllocatorType &r, dtl::true_type) { l = ::boost::move(r); } -} //namespace container_detail { +} //namespace dtl { } //namespace container { } //namespace boost { diff --git a/include/boost/container/detail/allocator_version_traits.hpp b/include/boost/container/detail/allocator_version_traits.hpp index 62492da..18460bd 100644 --- a/include/boost/container/detail/allocator_version_traits.hpp +++ b/include/boost/container/detail/allocator_version_traits.hpp @@ -33,12 +33,12 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { -template::value> +template::value> struct allocator_version_traits { - typedef ::boost::container::container_detail::integral_constant + typedef ::boost::container::dtl::integral_constant alloc_version; typedef typename Allocator::multiallocation_chain multiallocation_chain; @@ -67,7 +67,7 @@ struct allocator_version_traits template struct allocator_version_traits { - typedef ::boost::container::container_detail::integral_constant + typedef ::boost::container::dtl::integral_constant alloc_version; typedef typename boost::container::allocator_traits::pointer pointer; @@ -76,9 +76,9 @@ struct allocator_version_traits typedef typename boost::intrusive::pointer_traits:: template rebind_pointer::type void_ptr; - typedef container_detail::basic_multiallocation_chain + typedef dtl::basic_multiallocation_chain multialloc_cached_counted; - typedef boost::container::container_detail:: + typedef boost::container::dtl:: transform_multiallocation_chain < multialloc_cached_counted, value_type> multiallocation_chain; @@ -153,7 +153,7 @@ struct allocator_version_traits } }; -} //namespace container_detail { +} //namespace dtl { } //namespace container { } //namespace boost { diff --git a/include/boost/container/detail/construct_in_place.hpp b/include/boost/container/detail/construct_in_place.hpp index 9fecd24..b131f06 100644 --- a/include/boost/container/detail/construct_in_place.hpp +++ b/include/boost/container/detail/construct_in_place.hpp @@ -67,7 +67,7 @@ BOOST_CONTAINER_FORCEINLINE void assign_in_place(DstIt dest, InpIt source) template BOOST_CONTAINER_FORCEINLINE void assign_in_place(DstIt dest, value_init_construct_iterator) { - container_detail::value_init val; + dtl::value_init val; *dest = boost::move(val.get()); } diff --git a/include/boost/container/detail/container_or_allocator_rebind.hpp b/include/boost/container/detail/container_or_allocator_rebind.hpp index c60d1c0..d74df6c 100644 --- a/include/boost/container/detail/container_or_allocator_rebind.hpp +++ b/include/boost/container/detail/container_or_allocator_rebind.hpp @@ -24,7 +24,7 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { template::value> struct container_or_allocator_rebind_impl @@ -42,7 +42,7 @@ struct container_or_allocator_rebind : container_or_allocator_rebind_impl {}; -} //namespace container_detail { +} //namespace dtl { } //namespace container { } //namespace boost { diff --git a/include/boost/container/detail/container_rebind.hpp b/include/boost/container/detail/container_rebind.hpp index 79ad9d7..0ebb478 100644 --- a/include/boost/container/detail/container_rebind.hpp +++ b/include/boost/container/detail/container_rebind.hpp @@ -23,7 +23,7 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { template struct container_rebind; @@ -251,7 +251,7 @@ namespace container_detail { #endif //!defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) -} //namespace container_detail { +} //namespace dtl { } //namespace container { } //namespace boost { diff --git a/include/boost/container/detail/copy_move_algo.hpp b/include/boost/container/detail/copy_move_algo.hpp index 5293260..b6b3bf6 100644 --- a/include/boost/container/detail/copy_move_algo.hpp +++ b/include/boost/container/detail/copy_move_algo.hpp @@ -38,7 +38,7 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { template struct are_elements_contiguous @@ -75,7 +75,7 @@ class vector_iterator; template class vector_const_iterator; -} //namespace container_detail { +} //namespace dtl { } //namespace container { namespace interprocess { @@ -87,20 +87,20 @@ class offset_ptr; namespace container { -namespace container_detail { +namespace dtl { ///////////////////////// //vector_[const_]iterator ///////////////////////// template -struct are_elements_contiguous > +struct are_elements_contiguous > { static const bool value = true; }; template -struct are_elements_contiguous > +struct are_elements_contiguous > { static const bool value = true; }; @@ -130,7 +130,7 @@ template struct is_memtransfer_copy_assignable : boost::move_detail::and_ < are_contiguous_and_same - , container_detail::is_trivially_copy_assignable< typename ::boost::container::iterator_traits::value_type > + , dtl::is_trivially_copy_assignable< typename ::boost::container::iterator_traits::value_type > > {}; @@ -138,28 +138,28 @@ template struct is_memtransfer_copy_constructible : boost::move_detail::and_ < are_contiguous_and_same - , container_detail::is_trivially_copy_constructible< typename ::boost::container::iterator_traits::value_type > + , dtl::is_trivially_copy_constructible< typename ::boost::container::iterator_traits::value_type > > {}; template struct enable_if_memtransfer_copy_constructible - : enable_if, R> + : enable_if, R> {}; template struct disable_if_memtransfer_copy_constructible - : disable_if, R> + : disable_if, R> {}; template struct enable_if_memtransfer_copy_assignable - : enable_if, R> + : enable_if, R> {}; template struct disable_if_memtransfer_copy_assignable - : disable_if, R> + : disable_if, R> {}; template @@ -224,44 +224,44 @@ struct is_memzero_initializable { typedef typename ::boost::container::iterator_traits::value_type value_type; static const bool value = are_elements_contiguous::value && - ( container_detail::is_integral::value || container_detail::is_enum::value + ( dtl::is_integral::value || dtl::is_enum::value #if defined(BOOST_CONTAINER_MEMZEROED_POINTER_IS_NULL) - || container_detail::is_pointer::value + || dtl::is_pointer::value #endif #if defined(BOOST_CONTAINER_MEMZEROED_FLOATING_POINT_IS_ZERO) - || container_detail::is_floating_point::value + || dtl::is_floating_point::value #endif #if defined(BOOST_CONTAINER_MEMZEROED_FLOATING_POINT_IS_ZERO) && defined(BOOST_CONTAINER_MEMZEROED_POINTER_IS_NULL) - || container_detail::is_pod::value + || dtl::is_pod::value #endif ); }; template struct enable_if_memzero_initializable - : enable_if_c::value, R> + : enable_if_c::value, R> {}; template struct disable_if_memzero_initializable - : enable_if_c::value, R> + : enable_if_c::value, R> {}; template struct enable_if_trivially_destructible - : enable_if_c < container_detail::is_trivially_destructible + : enable_if_c < dtl::is_trivially_destructible ::value_type>::value , R> {}; template struct disable_if_trivially_destructible - : enable_if_c ::value_type>::value , R> {}; -} //namespace container_detail { +} //namespace dtl { ////////////////////////////////////////////////////////////////////////////// // @@ -281,7 +281,7 @@ template // F models ForwardIterator -inline typename container_detail::disable_if_memtransfer_copy_constructible::type +inline typename dtl::disable_if_memtransfer_copy_constructible::type uninitialized_move_alloc(Allocator &a, I f, I l, F r) { F back = r; @@ -305,9 +305,9 @@ template // F models ForwardIterator -inline typename container_detail::enable_if_memtransfer_copy_constructible::type +inline typename dtl::enable_if_memtransfer_copy_constructible::type uninitialized_move_alloc(Allocator &, I f, I l, F r) BOOST_NOEXCEPT_OR_NOTHROW -{ return container_detail::memmove(f, l, r); } +{ return dtl::memmove(f, l, r); } ////////////////////////////////////////////////////////////////////////////// // @@ -326,7 +326,7 @@ template // F models ForwardIterator -inline typename container_detail::disable_if_memtransfer_copy_constructible::type +inline typename dtl::disable_if_memtransfer_copy_constructible::type uninitialized_move_alloc_n(Allocator &a, I f, typename boost::container::allocator_traits::size_type n, F r) { F back = r; @@ -350,9 +350,9 @@ template // F models ForwardIterator -inline typename container_detail::enable_if_memtransfer_copy_constructible::type +inline typename dtl::enable_if_memtransfer_copy_constructible::type uninitialized_move_alloc_n(Allocator &, I f, typename boost::container::allocator_traits::size_type n, F r) BOOST_NOEXCEPT_OR_NOTHROW -{ return container_detail::memmove_n(f, n, r); } +{ return dtl::memmove_n(f, n, r); } ////////////////////////////////////////////////////////////////////////////// // @@ -371,7 +371,7 @@ template // F models ForwardIterator -inline typename container_detail::disable_if_memtransfer_copy_constructible::type +inline typename dtl::disable_if_memtransfer_copy_constructible::type uninitialized_move_alloc_n_source(Allocator &a, I f, typename boost::container::allocator_traits::size_type n, F r) { F back = r; @@ -395,9 +395,9 @@ template // F models ForwardIterator -inline typename container_detail::enable_if_memtransfer_copy_constructible::type +inline typename dtl::enable_if_memtransfer_copy_constructible::type uninitialized_move_alloc_n_source(Allocator &, I f, typename boost::container::allocator_traits::size_type n, F r) BOOST_NOEXCEPT_OR_NOTHROW -{ return container_detail::memmove_n_source(f, n, r); } +{ return dtl::memmove_n_source(f, n, r); } ////////////////////////////////////////////////////////////////////////////// // @@ -416,7 +416,7 @@ template // F models ForwardIterator -inline typename container_detail::disable_if_memtransfer_copy_constructible::type +inline typename dtl::disable_if_memtransfer_copy_constructible::type uninitialized_copy_alloc(Allocator &a, I f, I l, F r) { F back = r; @@ -440,9 +440,9 @@ template // F models ForwardIterator -inline typename container_detail::enable_if_memtransfer_copy_constructible::type +inline typename dtl::enable_if_memtransfer_copy_constructible::type uninitialized_copy_alloc(Allocator &, I f, I l, F r) BOOST_NOEXCEPT_OR_NOTHROW -{ return container_detail::memmove(f, l, r); } +{ return dtl::memmove(f, l, r); } ////////////////////////////////////////////////////////////////////////////// // @@ -461,7 +461,7 @@ template // F models ForwardIterator -inline typename container_detail::disable_if_memtransfer_copy_constructible::type +inline typename dtl::disable_if_memtransfer_copy_constructible::type uninitialized_copy_alloc_n(Allocator &a, I f, typename boost::container::allocator_traits::size_type n, F r) { F back = r; @@ -485,9 +485,9 @@ template // F models ForwardIterator -inline typename container_detail::enable_if_memtransfer_copy_constructible::type +inline typename dtl::enable_if_memtransfer_copy_constructible::type uninitialized_copy_alloc_n(Allocator &, I f, typename boost::container::allocator_traits::size_type n, F r) BOOST_NOEXCEPT_OR_NOTHROW -{ return container_detail::memmove_n(f, n, r); } +{ return dtl::memmove_n(f, n, r); } ////////////////////////////////////////////////////////////////////////////// // @@ -506,7 +506,7 @@ template // F models ForwardIterator -inline typename container_detail::disable_if_memtransfer_copy_constructible::type +inline typename dtl::disable_if_memtransfer_copy_constructible::type uninitialized_copy_alloc_n_source(Allocator &a, I f, typename boost::container::allocator_traits::size_type n, F r) { F back = r; @@ -530,9 +530,9 @@ template // F models ForwardIterator -inline typename container_detail::enable_if_memtransfer_copy_constructible::type +inline typename dtl::enable_if_memtransfer_copy_constructible::type uninitialized_copy_alloc_n_source(Allocator &, I f, typename boost::container::allocator_traits::size_type n, F r) BOOST_NOEXCEPT_OR_NOTHROW -{ return container_detail::memmove_n_source(f, n, r); } +{ return dtl::memmove_n_source(f, n, r); } ////////////////////////////////////////////////////////////////////////////// // @@ -550,7 +550,7 @@ inline typename container_detail::enable_if_memtransfer_copy_constructible // F models ForwardIterator -inline typename container_detail::disable_if_memzero_initializable::type +inline typename dtl::disable_if_memzero_initializable::type uninitialized_value_init_alloc_n(Allocator &a, typename boost::container::allocator_traits::size_type n, F r) { F back = r; @@ -573,7 +573,7 @@ inline typename container_detail::disable_if_memzero_initializable::type template // F models ForwardIterator -inline typename container_detail::enable_if_memzero_initializable::type +inline typename dtl::enable_if_memzero_initializable::type uninitialized_value_init_alloc_n(Allocator &, typename boost::container::allocator_traits::size_type n, F r) { typedef typename boost::container::iterator_traits::value_type value_type; @@ -698,7 +698,7 @@ inline F uninitialized_fill_alloc_n(Allocator &a, const T &v, typename boost::co template // F models ForwardIterator -inline typename container_detail::disable_if_memtransfer_copy_assignable::type +inline typename dtl::disable_if_memtransfer_copy_assignable::type copy(I f, I l, F r) { while (f != l) { @@ -711,9 +711,9 @@ inline typename container_detail::disable_if_memtransfer_copy_assignable // F models ForwardIterator -inline typename container_detail::enable_if_memtransfer_copy_assignable::type +inline typename dtl::enable_if_memtransfer_copy_assignable::type copy(I f, I l, F r) BOOST_NOEXCEPT_OR_NOTHROW -{ return container_detail::memmove(f, l, r); } +{ return dtl::memmove(f, l, r); } ////////////////////////////////////////////////////////////////////////////// // @@ -725,7 +725,7 @@ template // F models ForwardIterator -inline typename container_detail::disable_if_memtransfer_copy_assignable::type +inline typename dtl::disable_if_memtransfer_copy_assignable::type copy_n(I f, U n, F r) { while (n--) { @@ -739,9 +739,9 @@ template // F models ForwardIterator -inline typename container_detail::enable_if_memtransfer_copy_assignable::type +inline typename dtl::enable_if_memtransfer_copy_assignable::type copy_n(I f, U n, F r) BOOST_NOEXCEPT_OR_NOTHROW -{ return container_detail::memmove_n(f, n, r); } +{ return dtl::memmove_n(f, n, r); } ////////////////////////////////////////////////////////////////////////////// // @@ -753,7 +753,7 @@ template // F models ForwardIterator -inline typename container_detail::disable_if_memtransfer_copy_assignable::type +inline typename dtl::disable_if_memtransfer_copy_assignable::type copy_n_source(I f, U n, F r) { while (n--) { @@ -767,9 +767,9 @@ template // F models ForwardIterator -inline typename container_detail::enable_if_memtransfer_copy_assignable::type +inline typename dtl::enable_if_memtransfer_copy_assignable::type copy_n_source(I f, U n, F r) BOOST_NOEXCEPT_OR_NOTHROW -{ return container_detail::memmove_n_source(f, n, r); } +{ return dtl::memmove_n_source(f, n, r); } ////////////////////////////////////////////////////////////////////////////// // @@ -781,7 +781,7 @@ template // F models ForwardIterator -inline typename container_detail::disable_if_memtransfer_copy_assignable::type +inline typename dtl::disable_if_memtransfer_copy_assignable::type copy_n_source_dest(I f, U n, F &r) { while (n--) { @@ -795,9 +795,9 @@ template // F models ForwardIterator -inline typename container_detail::enable_if_memtransfer_copy_assignable::type +inline typename dtl::enable_if_memtransfer_copy_assignable::type copy_n_source_dest(I f, U n, F &r) BOOST_NOEXCEPT_OR_NOTHROW -{ return container_detail::memmove_n_source_dest(f, n, r); } +{ return dtl::memmove_n_source_dest(f, n, r); } ////////////////////////////////////////////////////////////////////////////// // @@ -808,7 +808,7 @@ inline typename container_detail::enable_if_memtransfer_copy_assignable template // F models ForwardIterator -inline typename container_detail::disable_if_memtransfer_copy_assignable::type +inline typename dtl::disable_if_memtransfer_copy_assignable::type move(I f, I l, F r) { while (f != l) { @@ -821,9 +821,9 @@ inline typename container_detail::disable_if_memtransfer_copy_assignable // F models ForwardIterator -inline typename container_detail::enable_if_memtransfer_copy_assignable::type +inline typename dtl::enable_if_memtransfer_copy_assignable::type move(I f, I l, F r) BOOST_NOEXCEPT_OR_NOTHROW -{ return container_detail::memmove(f, l, r); } +{ return dtl::memmove(f, l, r); } ////////////////////////////////////////////////////////////////////////////// // @@ -835,7 +835,7 @@ template // F models ForwardIterator -inline typename container_detail::disable_if_memtransfer_copy_assignable::type +inline typename dtl::disable_if_memtransfer_copy_assignable::type move_n(I f, U n, F r) { while (n--) { @@ -849,9 +849,9 @@ template // F models ForwardIterator -inline typename container_detail::enable_if_memtransfer_copy_assignable::type +inline typename dtl::enable_if_memtransfer_copy_assignable::type move_n(I f, U n, F r) BOOST_NOEXCEPT_OR_NOTHROW -{ return container_detail::memmove_n(f, n, r); } +{ return dtl::memmove_n(f, n, r); } ////////////////////////////////////////////////////////////////////////////// @@ -863,7 +863,7 @@ inline typename container_detail::enable_if_memtransfer_copy_assignable template // F models ForwardIterator -inline typename container_detail::disable_if_memtransfer_copy_assignable::type +inline typename dtl::disable_if_memtransfer_copy_assignable::type move_backward(I f, I l, F r) { while (f != l) { @@ -876,7 +876,7 @@ inline typename container_detail::disable_if_memtransfer_copy_assignable // F models ForwardIterator -inline typename container_detail::enable_if_memtransfer_copy_assignable::type +inline typename dtl::enable_if_memtransfer_copy_assignable::type move_backward(I f, I l, F r) BOOST_NOEXCEPT_OR_NOTHROW { typedef typename boost::container::iterator_traits::value_type value_type; @@ -896,7 +896,7 @@ template // F models ForwardIterator -inline typename container_detail::disable_if_memtransfer_copy_assignable::type +inline typename dtl::disable_if_memtransfer_copy_assignable::type move_n_source_dest(I f, U n, F &r) { while (n--) { @@ -910,9 +910,9 @@ template // F models ForwardIterator -inline typename container_detail::enable_if_memtransfer_copy_assignable::type +inline typename dtl::enable_if_memtransfer_copy_assignable::type move_n_source_dest(I f, U n, F &r) BOOST_NOEXCEPT_OR_NOTHROW -{ return container_detail::memmove_n_source_dest(f, n, r); } +{ return dtl::memmove_n_source_dest(f, n, r); } ////////////////////////////////////////////////////////////////////////////// // @@ -924,7 +924,7 @@ template // F models ForwardIterator -inline typename container_detail::disable_if_memtransfer_copy_assignable::type +inline typename dtl::disable_if_memtransfer_copy_assignable::type move_n_source(I f, U n, F r) { while (n--) { @@ -938,9 +938,9 @@ template // F models ForwardIterator -inline typename container_detail::enable_if_memtransfer_copy_assignable::type +inline typename dtl::enable_if_memtransfer_copy_assignable::type move_n_source(I f, U n, F r) BOOST_NOEXCEPT_OR_NOTHROW -{ return container_detail::memmove_n_source(f, n, r); } +{ return dtl::memmove_n_source(f, n, r); } ////////////////////////////////////////////////////////////////////////////// // @@ -952,7 +952,7 @@ template // U models unsigned integral constant -inline typename container_detail::disable_if_trivially_destructible::type +inline typename dtl::disable_if_trivially_destructible::type destroy_alloc_n(Allocator &a, I f, U n) { while(n){ @@ -966,7 +966,7 @@ template // U models unsigned integral constant -inline typename container_detail::enable_if_trivially_destructible::type +inline typename dtl::enable_if_trivially_destructible::type destroy_alloc_n(Allocator &, I, U) {} @@ -982,7 +982,7 @@ template ,typename F // F models ForwardIterator ,typename G // G models ForwardIterator > -inline typename container_detail::disable_if_memtransfer_copy_assignable::type +inline typename dtl::disable_if_memtransfer_copy_assignable::type deep_swap_alloc_n( Allocator &a, F short_range_f, typename allocator_traits::size_type n_i , G large_range_f, typename allocator_traits::size_type n_j) { @@ -1002,15 +1002,15 @@ template ,typename F // F models ForwardIterator ,typename G // G models ForwardIterator > -inline typename container_detail::enable_if_c - < container_detail::is_memtransfer_copy_assignable::value && (MaxTmpBytes <= DeepSwapAllocNMaxStorage) && false +inline typename dtl::enable_if_c + < dtl::is_memtransfer_copy_assignable::value && (MaxTmpBytes <= DeepSwapAllocNMaxStorage) && false , void>::type deep_swap_alloc_n( Allocator &a, F short_range_f, typename allocator_traits::size_type n_i , G large_range_f, typename allocator_traits::size_type n_j) { typedef typename allocator_traits::value_type value_type; - typedef typename container_detail::aligned_storage - ::value>::type storage_type; + typedef typename dtl::aligned_storage + ::value>::type storage_type; storage_type storage; const std::size_t n_i_bytes = sizeof(value_type)*n_i; @@ -1032,15 +1032,15 @@ template ,typename F // F models ForwardIterator ,typename G // G models ForwardIterator > -inline typename container_detail::enable_if_c - < container_detail::is_memtransfer_copy_assignable::value && true//(MaxTmpBytes > DeepSwapAllocNMaxStorage) +inline typename dtl::enable_if_c + < dtl::is_memtransfer_copy_assignable::value && true//(MaxTmpBytes > DeepSwapAllocNMaxStorage) , void>::type deep_swap_alloc_n( Allocator &a, F short_range_f, typename allocator_traits::size_type n_i , G large_range_f, typename allocator_traits::size_type n_j) { typedef typename allocator_traits::value_type value_type; - typedef typename container_detail::aligned_storage - ::value>::type storage_type; + typedef typename dtl::aligned_storage + ::value>::type storage_type; storage_type storage; const std::size_t sizeof_storage = sizeof(storage); diff --git a/include/boost/container/detail/destroyers.hpp b/include/boost/container/detail/destroyers.hpp index c3a5d90..9b0be44 100644 --- a/include/boost/container/detail/destroyers.hpp +++ b/include/boost/container/detail/destroyers.hpp @@ -30,7 +30,7 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { //!A deleter for scoped_ptr that deallocates the memory //!allocated for an object using a STL allocator. @@ -39,8 +39,8 @@ struct scoped_deallocator { typedef allocator_traits allocator_traits_type; typedef typename allocator_traits_type::pointer pointer; - typedef container_detail::integral_constant::value> alloc_version; private: @@ -142,8 +142,8 @@ struct scoped_destroy_deallocator typedef boost::container::allocator_traits AllocTraits; typedef typename AllocTraits::pointer pointer; typedef typename AllocTraits::size_type size_type; - typedef container_detail::integral_constant::value> alloc_version; scoped_destroy_deallocator(pointer p, Allocator& a) @@ -296,8 +296,8 @@ class allocator_destroyer typedef boost::container::allocator_traits AllocTraits; typedef typename AllocTraits::value_type value_type; typedef typename AllocTraits::pointer pointer; - typedef container_detail::integral_constant::value> alloc_version; private: @@ -369,7 +369,7 @@ class allocator_multialloc_chain_node_deallocator } }; -} //namespace container_detail { +} //namespace dtl { } //namespace container { } //namespace boost { diff --git a/include/boost/container/detail/dispatch_uses_allocator.hpp b/include/boost/container/detail/dispatch_uses_allocator.hpp index 946fdf6..0b8cfea 100644 --- a/include/boost/container/detail/dispatch_uses_allocator.hpp +++ b/include/boost/container/detail/dispatch_uses_allocator.hpp @@ -35,7 +35,7 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { // Check if we can detect is_convertible using advanced SFINAE expressions @@ -110,10 +110,10 @@ template < typename ConstructAlloc , typename T , class ...Args > -inline typename container_detail::enable_if_and +inline typename dtl::enable_if_and < void - , container_detail::is_not_pair - , container_detail::not_< uses_allocator > + , dtl::is_not_pair + , dtl::not_< uses_allocator > >::type dispatch_uses_allocator ( ConstructAlloc & construct_alloc, BOOST_FWD_REF(ArgAlloc) arg_alloc, T* p, BOOST_FWD_REF(Args)...args) { @@ -127,9 +127,9 @@ template < typename ConstructAlloc , typename T , class ...Args > -inline typename container_detail::enable_if_and +inline typename dtl::enable_if_and < void - , container_detail::is_not_pair + , dtl::is_not_pair , uses_allocator , is_constructible_with_allocator_prefix >::type dispatch_uses_allocator @@ -146,11 +146,11 @@ template < typename ConstructAlloc , typename T , class ...Args > -inline typename container_detail::enable_if_and +inline typename dtl::enable_if_and < void - , container_detail::is_not_pair + , dtl::is_not_pair , uses_allocator - , container_detail::not_ > + , dtl::not_ > >::type dispatch_uses_allocator ( ConstructAlloc& construct_alloc, BOOST_FWD_REF(ArgAlloc) arg_alloc, T* p, BOOST_FWD_REF(Args)...args) { @@ -162,10 +162,10 @@ inline typename container_detail::enable_if_and #define BOOST_CONTAINER_SCOPED_ALLOCATOR_DISPATCH_USES_ALLOCATOR_CODE(N) \ template \ - inline typename container_detail::enable_if_and\ + inline typename dtl::enable_if_and\ < void\ - , container_detail::is_not_pair\ - , container_detail::not_ >\ + , dtl::is_not_pair\ + , dtl::not_ >\ >::type\ dispatch_uses_allocator\ (ConstructAlloc &construct_alloc, BOOST_FWD_REF(ArgAlloc) arg_alloc, T* p BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\ @@ -179,9 +179,9 @@ BOOST_MOVE_ITERATE_0TO9(BOOST_CONTAINER_SCOPED_ALLOCATOR_DISPATCH_USES_ALLOCATOR #define BOOST_CONTAINER_SCOPED_ALLOCATOR_DISPATCH_USES_ALLOCATOR_CODE(N) \ template < typename ConstructAlloc, typename ArgAlloc, typename T BOOST_MOVE_I##N BOOST_MOVE_CLASS##N >\ - inline typename container_detail::enable_if_and\ + inline typename dtl::enable_if_and\ < void\ - , container_detail::is_not_pair\ + , dtl::is_not_pair\ , uses_allocator\ , is_constructible_with_allocator_prefix\ >::type\ @@ -197,11 +197,11 @@ BOOST_MOVE_ITERATE_0TO9(BOOST_CONTAINER_SCOPED_ALLOCATOR_DISPATCH_USES_ALLOCATOR #define BOOST_CONTAINER_SCOPED_ALLOCATOR_DISPATCH_USES_ALLOCATOR_CODE(N) \ template < typename ConstructAlloc, typename ArgAlloc, typename T BOOST_MOVE_I##N BOOST_MOVE_CLASS##N >\ - inline typename container_detail::enable_if_and\ + inline typename dtl::enable_if_and\ < void\ - , container_detail::is_not_pair\ + , dtl::is_not_pair\ , uses_allocator\ - , container_detail::not_ >\ + , dtl::not_ >\ >::type\ dispatch_uses_allocator\ (ConstructAlloc& construct_alloc, BOOST_FWD_REF(ArgAlloc) arg_alloc, T* p BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\ @@ -219,18 +219,18 @@ template < typename ConstructAlloc , typename ArgAlloc , typename Pair > inline -BOOST_CONTAINER_DOC1ST(void, typename container_detail::enable_if >::type) +BOOST_CONTAINER_DOC1ST(void, typename dtl::enable_if >::type) dispatch_uses_allocator ( ConstructAlloc & construct_alloc , BOOST_FWD_REF(ArgAlloc) arg_alloc , Pair* p) { - (dispatch_uses_allocator)(construct_alloc, arg_alloc, container_detail::addressof(p->first)); + (dispatch_uses_allocator)(construct_alloc, arg_alloc, dtl::addressof(p->first)); BOOST_TRY{ - (dispatch_uses_allocator)(construct_alloc, arg_alloc, container_detail::addressof(p->second)); + (dispatch_uses_allocator)(construct_alloc, arg_alloc, dtl::addressof(p->second)); } BOOST_CATCH(...) { - allocator_traits::destroy(construct_alloc, container_detail::addressof(p->first)); + allocator_traits::destroy(construct_alloc, dtl::addressof(p->first)); BOOST_RETHROW } BOOST_CATCH_END @@ -240,18 +240,18 @@ BOOST_CONTAINER_DOC1ST(void, typename container_detail::enable_if -BOOST_CONTAINER_DOC1ST(void, typename container_detail::enable_if >::type) +BOOST_CONTAINER_DOC1ST(void, typename dtl::enable_if >::type) dispatch_uses_allocator ( ConstructAlloc & construct_alloc , BOOST_FWD_REF(ArgAlloc) arg_alloc , Pair* p, BOOST_FWD_REF(U) x, BOOST_FWD_REF(V) y) { - (dispatch_uses_allocator)(construct_alloc, arg_alloc, container_detail::addressof(p->first), ::boost::forward(x)); + (dispatch_uses_allocator)(construct_alloc, arg_alloc, dtl::addressof(p->first), ::boost::forward(x)); BOOST_TRY{ - (dispatch_uses_allocator)(construct_alloc, arg_alloc, container_detail::addressof(p->second), ::boost::forward(y)); + (dispatch_uses_allocator)(construct_alloc, arg_alloc, dtl::addressof(p->second), ::boost::forward(y)); } BOOST_CATCH(...){ - allocator_traits::destroy(construct_alloc, container_detail::addressof(p->first)); + allocator_traits::destroy(construct_alloc, dtl::addressof(p->first)); BOOST_RETHROW } BOOST_CATCH_END @@ -260,7 +260,7 @@ BOOST_CONTAINER_DOC1ST(void, typename container_detail::enable_if -BOOST_CONTAINER_DOC1ST(void, typename container_detail::enable_if< container_detail::is_pair >::type) +BOOST_CONTAINER_DOC1ST(void, typename dtl::enable_if< dtl::is_pair >::type) dispatch_uses_allocator (ConstructAlloc & construct_alloc , BOOST_FWD_REF(ArgAlloc) arg_alloc @@ -270,10 +270,10 @@ BOOST_CONTAINER_DOC1ST(void, typename container_detail::enable_if< container_det template < typename ConstructAlloc , typename ArgAlloc , class Pair, class Pair2> -typename container_detail::enable_if_and +typename dtl::enable_if_and < void - , container_detail::is_pair - , container_detail::not_ > >::type //This is needed for MSVC10 and ambiguous overloads + , dtl::is_pair + , dtl::not_ > >::type //This is needed for MSVC10 and ambiguous overloads dispatch_uses_allocator (ConstructAlloc & construct_alloc , BOOST_FWD_REF(ArgAlloc) arg_alloc @@ -286,20 +286,20 @@ typename container_detail::enable_if_and template< typename ConstructAlloc, typename ArgAlloc, class Pair \ , template class BoostTuple \ BOOST_MOVE_I_IF(BOOST_MOVE_OR(N,M)) BOOST_MOVE_CLASS##N BOOST_MOVE_I_IF(BOOST_MOVE_AND(N,M)) BOOST_MOVE_CLASSQ##M > \ -typename container_detail::enable_if< container_detail::is_pair >::type\ +typename dtl::enable_if< dtl::is_pair >::type\ dispatch_uses_allocator( ConstructAlloc & construct_alloc, BOOST_FWD_REF(ArgAlloc) arg_alloc, Pair* pair, piecewise_construct_t\ , BoostTuple p\ , BoostTuple q)\ {\ (void)p; (void)q;\ (dispatch_uses_allocator)\ - (construct_alloc, arg_alloc, container_detail::addressof(pair->first) BOOST_MOVE_I_IF(N) BOOST_MOVE_TMPL_GET##N);\ + (construct_alloc, arg_alloc, dtl::addressof(pair->first) BOOST_MOVE_I_IF(N) BOOST_MOVE_TMPL_GET##N);\ BOOST_TRY{\ (dispatch_uses_allocator)\ - (construct_alloc, arg_alloc, container_detail::addressof(pair->second) BOOST_MOVE_I_IF(M) BOOST_MOVE_TMPL_GETQ##M);\ + (construct_alloc, arg_alloc, dtl::addressof(pair->second) BOOST_MOVE_I_IF(M) BOOST_MOVE_TMPL_GETQ##M);\ }\ BOOST_CATCH(...) {\ - allocator_traits::destroy(construct_alloc, container_detail::addressof(pair->first));\ + allocator_traits::destroy(construct_alloc, dtl::addressof(pair->first));\ BOOST_RETHROW\ }\ BOOST_CATCH_END\ @@ -317,12 +317,12 @@ BOOST_MOVE_ITER2D_0TOMAX(9, BOOST_DISPATCH_USES_ALLOCATOR_PIECEWISE_CONSTRUCT_BO , Tuple& t1, Tuple& t2, index_tuple, index_tuple) { (void)t1; (void)t2; - (dispatch_uses_allocator)(construct_alloc, arg_alloc, container_detail::addressof(pair->first), ::boost::forward(get(t1))...); + (dispatch_uses_allocator)(construct_alloc, arg_alloc, dtl::addressof(pair->first), ::boost::forward(get(t1))...); BOOST_TRY{ - (dispatch_uses_allocator)(construct_alloc, arg_alloc, container_detail::addressof(pair->second), ::boost::forward(get(t2))...); + (dispatch_uses_allocator)(construct_alloc, arg_alloc, dtl::addressof(pair->second), ::boost::forward(get(t2))...); } BOOST_CATCH(...){ - allocator_traits::destroy(construct_alloc, container_detail::addressof(pair->first)); + allocator_traits::destroy(construct_alloc, dtl::addressof(pair->first)); BOOST_RETHROW } BOOST_CATCH_END @@ -330,7 +330,7 @@ BOOST_MOVE_ITER2D_0TOMAX(9, BOOST_DISPATCH_USES_ALLOCATOR_PIECEWISE_CONSTRUCT_BO template< typename ConstructAlloc, typename ArgAlloc, class Pair , template class Tuple, class... Args1, class... Args2> - typename container_detail::enable_if< container_detail::is_pair >::type + typename dtl::enable_if< dtl::is_pair >::type dispatch_uses_allocator( ConstructAlloc & construct_alloc, BOOST_FWD_REF(ArgAlloc) arg_alloc, Pair* pair, piecewise_construct_t , Tuple t1, Tuple t2) { @@ -346,20 +346,20 @@ BOOST_MOVE_ITER2D_0TOMAX(9, BOOST_DISPATCH_USES_ALLOCATOR_PIECEWISE_CONSTRUCT_BO template< typename ConstructAlloc, typename ArgAlloc, class Pair\ , template class StdTuple\ BOOST_MOVE_I_IF(BOOST_MOVE_OR(N,M)) BOOST_MOVE_CLASS##N BOOST_MOVE_I_IF(BOOST_MOVE_AND(N,M)) BOOST_MOVE_CLASSQ##M > \ - typename container_detail::enable_if< container_detail::is_pair >::type\ + typename dtl::enable_if< dtl::is_pair >::type\ dispatch_uses_allocator(ConstructAlloc & construct_alloc, BOOST_FWD_REF(ArgAlloc) arg_alloc, Pair* pair, piecewise_construct_t\ , StdTuple p\ , StdTuple q)\ {\ (void)p; (void)q;\ (dispatch_uses_allocator)\ - (construct_alloc, arg_alloc, container_detail::addressof(pair->first) BOOST_MOVE_I_IF(N) BOOST_MOVE_GET_IDX##N);\ + (construct_alloc, arg_alloc, dtl::addressof(pair->first) BOOST_MOVE_I_IF(N) BOOST_MOVE_GET_IDX##N);\ BOOST_TRY{\ (dispatch_uses_allocator)\ - (construct_alloc, arg_alloc, container_detail::addressof(pair->second) BOOST_MOVE_I_IF(M) BOOST_MOVE_GET_IDXQ##M);\ + (construct_alloc, arg_alloc, dtl::addressof(pair->second) BOOST_MOVE_I_IF(M) BOOST_MOVE_GET_IDXQ##M);\ }\ BOOST_CATCH(...) {\ - allocator_traits::destroy(construct_alloc, container_detail::addressof(pair->first));\ + allocator_traits::destroy(construct_alloc, dtl::addressof(pair->first));\ BOOST_RETHROW\ }\ BOOST_CATCH_END\ @@ -380,7 +380,7 @@ BOOST_MOVE_ITER2D_0TOMAX(9, BOOST_DISPATCH_USES_ALLOCATOR_PIECEWISE_CONSTRUCT_BO template< typename ConstructAlloc, typename ArgAlloc, class Pair\ , template class StdTuple \ BOOST_MOVE_I_IF(BOOST_MOVE_OR(N,M)) BOOST_MOVE_CLASS##N BOOST_MOVE_I_IF(BOOST_MOVE_AND(N,M)) BOOST_MOVE_CLASSQ##M > \ - typename container_detail::enable_if< container_detail::is_pair >::type\ + typename dtl::enable_if< dtl::is_pair >::type\ dispatch_uses_allocator\ ( ConstructAlloc & construct_alloc, BOOST_FWD_REF(ArgAlloc) arg_alloc, Pair* pair, piecewise_construct_t\ , StdTuple p\ @@ -388,13 +388,13 @@ BOOST_MOVE_ITER2D_0TOMAX(9, BOOST_DISPATCH_USES_ALLOCATOR_PIECEWISE_CONSTRUCT_BO {\ (void)p; (void)q;\ (dispatch_uses_allocator)\ - (construct_alloc, arg_alloc, container_detail::addressof(pair->first) BOOST_MOVE_I_IF(N) BOOST_MOVE_GET_IDX##N);\ + (construct_alloc, arg_alloc, dtl::addressof(pair->first) BOOST_MOVE_I_IF(N) BOOST_MOVE_GET_IDX##N);\ BOOST_TRY{\ (dispatch_uses_allocator)\ - (construct_alloc, arg_alloc, container_detail::addressof(pair->second) BOOST_MOVE_I_IF(M) BOOST_MOVE_GET_IDXQ##M);\ + (construct_alloc, arg_alloc, dtl::addressof(pair->second) BOOST_MOVE_I_IF(M) BOOST_MOVE_GET_IDXQ##M);\ }\ BOOST_CATCH(...) {\ - allocator_traits::destroy(construct_alloc, container_detail::addressof(pair->first));\ + allocator_traits::destroy(construct_alloc, dtl::addressof(pair->first));\ BOOST_RETHROW\ }\ BOOST_CATCH_END\ @@ -411,16 +411,16 @@ BOOST_MOVE_ITER2D_0TOMAX(9, BOOST_DISPATCH_USES_ALLOCATOR_PIECEWISE_CONSTRUCT_BO template < typename ConstructAlloc , typename ArgAlloc , class Pair, class KeyType, class ... Args> -typename container_detail::enable_if< container_detail::is_pair, void >::type +typename dtl::enable_if< dtl::is_pair, void >::type dispatch_uses_allocator (ConstructAlloc & construct_alloc, BOOST_FWD_REF(ArgAlloc) arg_alloc, Pair* p, try_emplace_t, BOOST_FWD_REF(KeyType) k, BOOST_FWD_REF(Args) ...args) { - (dispatch_uses_allocator)(construct_alloc, arg_alloc, container_detail::addressof(p->first), ::boost::forward(k)); + (dispatch_uses_allocator)(construct_alloc, arg_alloc, dtl::addressof(p->first), ::boost::forward(k)); BOOST_TRY{ - (dispatch_uses_allocator)(construct_alloc, arg_alloc, container_detail::addressof(p->second), ::boost::forward(args)...); + (dispatch_uses_allocator)(construct_alloc, arg_alloc, dtl::addressof(p->second), ::boost::forward(args)...); } BOOST_CATCH(...) { - allocator_traits::destroy(construct_alloc, container_detail::addressof(p->first)); + allocator_traits::destroy(construct_alloc, dtl::addressof(p->first)); BOOST_RETHROW } BOOST_CATCH_END @@ -430,18 +430,18 @@ typename container_detail::enable_if< container_detail::is_pair, void >::t #define BOOST_CONTAINER_DISPATCH_USES_ALLOCATOR_PAIR_TRY_EMPLACE_CODE(N) \ template \ - inline typename container_detail::enable_if\ - < container_detail::is_pair, void >::type\ + inline typename dtl::enable_if\ + < dtl::is_pair, void >::type\ dispatch_uses_allocator\ (ConstructAlloc &construct_alloc, BOOST_FWD_REF(ArgAlloc) arg_alloc, Pair* p, try_emplace_t, \ BOOST_FWD_REF(KeyType) k BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\ {\ - (dispatch_uses_allocator)(construct_alloc, arg_alloc, container_detail::addressof(p->first), ::boost::forward(k));\ + (dispatch_uses_allocator)(construct_alloc, arg_alloc, dtl::addressof(p->first), ::boost::forward(k));\ BOOST_TRY{\ - (dispatch_uses_allocator)(construct_alloc, arg_alloc, container_detail::addressof(p->second) BOOST_MOVE_I##N BOOST_MOVE_FWD##N);\ + (dispatch_uses_allocator)(construct_alloc, arg_alloc, dtl::addressof(p->second) BOOST_MOVE_I##N BOOST_MOVE_FWD##N);\ }\ BOOST_CATCH(...) {\ - allocator_traits::destroy(construct_alloc, container_detail::addressof(p->first));\ + allocator_traits::destroy(construct_alloc, dtl::addressof(p->first));\ BOOST_RETHROW\ }\ BOOST_CATCH_END\ @@ -452,7 +452,7 @@ BOOST_MOVE_ITERATE_0TO9(BOOST_CONTAINER_DISPATCH_USES_ALLOCATOR_PAIR_TRY_EMPLACE #endif //!defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) -} //namespace container_detail +} //namespace dtl }} // namespace boost { namespace container { diff --git a/include/boost/container/detail/flat_tree.hpp b/include/boost/container/detail/flat_tree.hpp index 319cad6..22f9187 100644 --- a/include/boost/container/detail/flat_tree.hpp +++ b/include/boost/container/detail/flat_tree.hpp @@ -56,7 +56,7 @@ //merge_unique #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_FUNCNAME merge_unique -#define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_BEG namespace boost { namespace container { namespace container_detail { +#define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_BEG namespace boost { namespace container { namespace dtl { #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_END }}} #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_MIN 3 #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_MAX 3 @@ -64,7 +64,7 @@ //merge_equal #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_FUNCNAME merge -#define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_BEG namespace boost { namespace container { namespace container_detail { +#define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_BEG namespace boost { namespace container { namespace dtl { #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_END }}} #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_MIN 3 #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_MAX 3 @@ -72,7 +72,7 @@ //index_of #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_FUNCNAME index_of -#define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_BEG namespace boost { namespace container { namespace container_detail { +#define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_BEG namespace boost { namespace container { namespace dtl { #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_END }}} #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_MIN 1 #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_MAX 1 @@ -80,7 +80,7 @@ //nth #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_FUNCNAME nth -#define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_BEG namespace boost { namespace container { namespace container_detail { +#define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_BEG namespace boost { namespace container { namespace dtl { #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_END }}} #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_MIN 1 #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_MAX 1 @@ -88,7 +88,7 @@ //reserve #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_FUNCNAME reserve -#define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_BEG namespace boost { namespace container { namespace container_detail { +#define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_BEG namespace boost { namespace container { namespace dtl { #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_END }}} #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_MIN 1 #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_MAX 1 @@ -96,7 +96,7 @@ //capacity #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_FUNCNAME capacity -#define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_BEG namespace boost { namespace container { namespace container_detail { +#define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_BEG namespace boost { namespace container { namespace dtl { #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_END }}} #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_MIN 0 #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_MAX 0 @@ -106,20 +106,20 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { BOOST_INTRUSIVE_INSTANTIATE_DEFAULT_TYPE_TMPLT(stored_allocator_type) template BOOST_CONTAINER_FORCEINLINE void flat_tree_merge_equal - (SequenceContainer& dest, Iterator first, Iterator last, Compare comp, container_detail::true_) + (SequenceContainer& dest, Iterator first, Iterator last, Compare comp, dtl::true_) { dest.merge(first, last, comp); } template BOOST_CONTAINER_FORCEINLINE void flat_tree_merge_equal_non_merge_member - (SequenceContainer& dest, Iterator first, Iterator last, Compare comp, container_detail::true_) + (SequenceContainer& dest, Iterator first, Iterator last, Compare comp, dtl::true_) { typedef typename SequenceContainer::iterator iterator; typedef typename SequenceContainer::value_type value_type; @@ -135,7 +135,7 @@ BOOST_CONTAINER_FORCEINLINE void flat_tree_merge_equal_non_merge_member template BOOST_CONTAINER_FORCEINLINE void flat_tree_merge_equal_non_merge_member - (SequenceContainer& dest, Iterator first, Iterator last, Compare comp, container_detail::false_) + (SequenceContainer& dest, Iterator first, Iterator last, Compare comp, dtl::false_) { typedef typename SequenceContainer::iterator iterator; @@ -146,24 +146,24 @@ BOOST_CONTAINER_FORCEINLINE void flat_tree_merge_equal_non_merge_member template BOOST_CONTAINER_FORCEINLINE void flat_tree_merge_equal - (SequenceContainer& dest, Iterator first, Iterator last, Compare comp, container_detail::false_) + (SequenceContainer& dest, Iterator first, Iterator last, Compare comp, dtl::false_) { (flat_tree_merge_equal_non_merge_member)( dest, first, last, comp - , container_detail::bool_::value>()); + , dtl::bool_::value>()); } template BOOST_CONTAINER_FORCEINLINE void flat_tree_merge_unique - (SequenceContainer& dest, Iterator first, Iterator last, Compare comp, container_detail::true_) + (SequenceContainer& dest, Iterator first, Iterator last, Compare comp, dtl::true_) { dest.merge_unique(first, last, comp); } template BOOST_CONTAINER_FORCEINLINE void flat_tree_merge_unique - (SequenceContainer& dest, Iterator first, Iterator last, Compare comp, container_detail::false_) + (SequenceContainer& dest, Iterator first, Iterator last, Compare comp, dtl::false_) { - (flat_tree_merge_equal)(dest, first, last, comp, container_detail::false_()); + (flat_tree_merge_equal)(dest, first, last, comp, dtl::false_()); dest.erase(boost::movelib::unique (dest.begin(), dest.end(), boost::movelib::negate(comp)), dest.cend()); } @@ -171,7 +171,7 @@ BOOST_CONTAINER_FORCEINLINE void flat_tree_merge_unique template BOOST_CONTAINER_FORCEINLINE typename SequenceContainer::size_type flat_tree_index_of - (SequenceContainer& cont, Iterator p, container_detail::true_) + (SequenceContainer& cont, Iterator p, dtl::true_) { return cont.index_of(p); } @@ -179,7 +179,7 @@ BOOST_CONTAINER_FORCEINLINE typename SequenceContainer::size_type template BOOST_CONTAINER_FORCEINLINE typename SequenceContainer::size_type flat_tree_index_of - (SequenceContainer& cont, Iterator p, container_detail::false_) + (SequenceContainer& cont, Iterator p, dtl::false_) { typedef typename SequenceContainer::size_type size_type; return static_cast(p - cont.begin()); @@ -188,7 +188,7 @@ BOOST_CONTAINER_FORCEINLINE typename SequenceContainer::size_type template BOOST_CONTAINER_FORCEINLINE Iterator flat_tree_nth - (SequenceContainer& cont, typename SequenceContainer::size_type n, container_detail::true_) + (SequenceContainer& cont, typename SequenceContainer::size_type n, dtl::true_) { return cont.nth(n); } @@ -196,7 +196,7 @@ BOOST_CONTAINER_FORCEINLINE Iterator template BOOST_CONTAINER_FORCEINLINE Iterator flat_tree_nth - (SequenceContainer& cont, typename SequenceContainer::size_type n, container_detail::false_) + (SequenceContainer& cont, typename SequenceContainer::size_type n, dtl::false_) { return cont.begin()+ n; } @@ -204,7 +204,7 @@ BOOST_CONTAINER_FORCEINLINE Iterator template BOOST_CONTAINER_FORCEINLINE typename SequenceContainer::stored_allocator_type & flat_tree_get_stored_allocator - (SequenceContainer& cont, container_detail::true_) + (SequenceContainer& cont, dtl::true_) { return cont.get_stored_allocator(); } @@ -212,7 +212,7 @@ BOOST_CONTAINER_FORCEINLINE typename SequenceContainer::stored_allocator_type & template BOOST_CONTAINER_FORCEINLINE const typename SequenceContainer::stored_allocator_type & flat_tree_get_stored_allocator - (const SequenceContainer& cont, container_detail::true_) + (const SequenceContainer& cont, dtl::true_) { return cont.get_stored_allocator(); } @@ -220,13 +220,13 @@ BOOST_CONTAINER_FORCEINLINE const typename SequenceContainer::stored_allocator_t template BOOST_CONTAINER_FORCEINLINE typename SequenceContainer::allocator_type flat_tree_get_stored_allocator - (SequenceContainer& cont, container_detail::false_) + (SequenceContainer& cont, dtl::false_) { return cont.get_allocator(); } template -void flat_tree_adopt_sequence_equal(SequenceContainer &tseq, BOOST_RV_REF(SequenceContainer) seq, Compare comp, container_detail::true_) +void flat_tree_adopt_sequence_equal(SequenceContainer &tseq, BOOST_RV_REF(SequenceContainer) seq, Compare comp, dtl::true_) { tseq.clear(); boost::movelib::adaptive_sort @@ -239,14 +239,14 @@ void flat_tree_adopt_sequence_equal(SequenceContainer &tseq, BOOST_RV_REF(Sequen } template -void flat_tree_adopt_sequence_equal(SequenceContainer &tseq, BOOST_RV_REF(SequenceContainer) seq, Compare comp, container_detail::false_) +void flat_tree_adopt_sequence_equal(SequenceContainer &tseq, BOOST_RV_REF(SequenceContainer) seq, Compare comp, dtl::false_) { boost::movelib::adaptive_sort(seq.begin(), seq.end(), comp); tseq = boost::move(seq); } template -void flat_tree_adopt_sequence_unique(SequenceContainer &tseq, BOOST_RV_REF(SequenceContainer) seq, Compare comp, container_detail::true_) +void flat_tree_adopt_sequence_unique(SequenceContainer &tseq, BOOST_RV_REF(SequenceContainer) seq, Compare comp, dtl::true_) { boost::movelib::adaptive_sort ( boost::movelib::iterator_to_raw_pointer(seq.begin()) @@ -261,7 +261,7 @@ void flat_tree_adopt_sequence_unique(SequenceContainer &tseq, BOOST_RV_REF(Seque } template -void flat_tree_adopt_sequence_unique(SequenceContainer &tseq, BOOST_RV_REF(SequenceContainer) seq, Compare comp, container_detail::false_) +void flat_tree_adopt_sequence_unique(SequenceContainer &tseq, BOOST_RV_REF(SequenceContainer) seq, Compare comp, dtl::false_) { boost::movelib::adaptive_sort(seq.begin(), seq.end(), comp); seq.erase(boost::movelib::unique @@ -271,27 +271,27 @@ void flat_tree_adopt_sequence_unique(SequenceContainer &tseq, BOOST_RV_REF(Seque template BOOST_CONTAINER_FORCEINLINE void - flat_tree_reserve(SequenceContainer &tseq, typename SequenceContainer::size_type cap, container_detail::true_) + flat_tree_reserve(SequenceContainer &tseq, typename SequenceContainer::size_type cap, dtl::true_) { tseq.reserve(cap); } template BOOST_CONTAINER_FORCEINLINE void - flat_tree_reserve(SequenceContainer &, typename SequenceContainer::size_type, container_detail::false_) + flat_tree_reserve(SequenceContainer &, typename SequenceContainer::size_type, dtl::false_) { } template BOOST_CONTAINER_FORCEINLINE typename SequenceContainer::size_type - flat_tree_capacity(const SequenceContainer &tseq, container_detail::true_) + flat_tree_capacity(const SequenceContainer &tseq, dtl::true_) { return tseq.capacity(); } template BOOST_CONTAINER_FORCEINLINE typename SequenceContainer::size_type - flat_tree_capacity(const SequenceContainer &tseq, container_detail::false_) + flat_tree_capacity(const SequenceContainer &tseq, dtl::false_) { return tseq.size(); } @@ -328,9 +328,9 @@ class flat_tree_value_compare template struct get_flat_tree_iterators { - typedef typename boost::container::container_detail:: + typedef typename boost::container::dtl:: vec_iterator iterator; - typedef typename boost::container::container_detail:: + typedef typename boost::container::dtl:: vec_iterator const_iterator; typedef boost::container::reverse_iterator reverse_iterator; typedef boost::container::reverse_iterator const_reverse_iterator; @@ -338,7 +338,7 @@ struct get_flat_tree_iterators */ template < class Value, class AllocatorOrContainer - , bool = boost::container::container_detail::is_container::value > + , bool = boost::container::dtl::is_container::value > struct select_container_type { typedef AllocatorOrContainer type; @@ -452,20 +452,20 @@ class flat_tree //!Standard extension typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT - (boost::container::container_detail::, container_type + (boost::container::dtl::, container_type ,stored_allocator_type, allocator_type) stored_allocator_type; static const bool has_stored_allocator_type = - BOOST_INTRUSIVE_HAS_TYPE(boost::container::container_detail::, container_type, stored_allocator_type); + BOOST_INTRUSIVE_HAS_TYPE(boost::container::dtl::, container_type, stored_allocator_type); private: typedef allocator_traits stored_allocator_traits; public: - typedef typename container_detail::if_c + typedef typename dtl::if_c ::type get_stored_allocator_const_return_t; - typedef typename container_detail::if_c + typedef typename dtl::if_c ::type get_stored_allocator_noconst_return_t; BOOST_CONTAINER_FORCEINLINE flat_tree() @@ -489,7 +489,7 @@ class flat_tree { } BOOST_CONTAINER_FORCEINLINE flat_tree(BOOST_RV_REF(flat_tree) x) - BOOST_NOEXCEPT_IF(boost::container::container_detail::is_nothrow_move_constructible::value) + BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_constructible::value) : m_data(boost::move(x.m_data)) { } @@ -599,7 +599,7 @@ class flat_tree BOOST_CONTAINER_FORCEINLINE flat_tree& operator=(BOOST_RV_REF(flat_tree) x) BOOST_NOEXCEPT_IF( (allocator_traits_type::propagate_on_container_move_assignment::value || allocator_traits_type::is_always_equal::value) && - boost::container::container_detail::is_nothrow_move_assignable::value) + boost::container::dtl::is_nothrow_move_assignable::value) { m_data = boost::move(x.m_data); return *this; } BOOST_CONTAINER_FORCEINLINE const value_compare &priv_value_comp() const @@ -632,12 +632,12 @@ class flat_tree BOOST_CONTAINER_FORCEINLINE get_stored_allocator_const_return_t get_stored_allocator() const { - return flat_tree_get_stored_allocator(this->m_data.m_seq, container_detail::bool_()); + return flat_tree_get_stored_allocator(this->m_data.m_seq, dtl::bool_()); } BOOST_CONTAINER_FORCEINLINE get_stored_allocator_noconst_return_t get_stored_allocator() { - return flat_tree_get_stored_allocator(this->m_data.m_seq, container_detail::bool_()); + return flat_tree_get_stored_allocator(this->m_data.m_seq, dtl::bool_()); } BOOST_CONTAINER_FORCEINLINE iterator begin() @@ -687,7 +687,7 @@ class flat_tree BOOST_CONTAINER_FORCEINLINE void swap(flat_tree& other) BOOST_NOEXCEPT_IF( allocator_traits_type::is_always_equal::value - && boost::container::container_detail::is_nothrow_swappable::value ) + && boost::container::dtl::is_nothrow_swappable::value ) { this->m_data.swap(other.m_data); } public: @@ -775,8 +775,8 @@ class flat_tree template void insert_equal(InIt first, InIt last #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) - , typename container_detail::enable_if_c - < container_detail::is_input_iterator::value + , typename dtl::enable_if_c + < dtl::is_input_iterator::value >::type * = 0 #endif ) @@ -785,8 +785,8 @@ class flat_tree template void insert_equal(InIt first, InIt last #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) - , typename container_detail::enable_if_c - < !container_detail::is_input_iterator::value + , typename dtl::enable_if_c + < !dtl::is_input_iterator::value >::type * = 0 #endif ) @@ -801,8 +801,8 @@ class flat_tree template void insert_equal(ordered_range_t, InIt first, InIt last #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) - , typename container_detail::enable_if_c - < container_detail::is_input_iterator::value + , typename dtl::enable_if_c + < dtl::is_input_iterator::value >::type * = 0 #endif ) @@ -811,9 +811,9 @@ class flat_tree template void insert_equal(ordered_range_t, FwdIt first, FwdIt last #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) - , typename container_detail::enable_if_c - < !container_detail::is_input_iterator::value && - container_detail::is_forward_iterator::value + , typename dtl::enable_if_c + < !dtl::is_input_iterator::value && + dtl::is_forward_iterator::value >::type * = 0 #endif ) @@ -826,26 +826,26 @@ class flat_tree template void insert_equal(ordered_range_t, BidirIt first, BidirIt last #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) - , typename container_detail::disable_if_or + , typename dtl::disable_if_or < void - , container_detail::is_input_iterator - , container_detail::is_forward_iterator + , dtl::is_input_iterator + , dtl::is_forward_iterator >::type * = 0 #endif ) { - const bool value = boost::container::container_detail:: + const bool value = boost::container::dtl:: has_member_function_callable_with_merge_unique::value; - (flat_tree_merge_equal)(this->m_data.m_seq, first, last, this->priv_value_comp(), container_detail::bool_()); + (flat_tree_merge_equal)(this->m_data.m_seq, first, last, this->priv_value_comp(), dtl::bool_()); } template void insert_unique(ordered_unique_range_t, InIt first, InIt last #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) - , typename container_detail::enable_if_or + , typename dtl::enable_if_or < void - , container_detail::is_input_iterator - , container_detail::is_forward_iterator + , dtl::is_input_iterator + , dtl::is_forward_iterator >::type * = 0 #endif ) @@ -860,16 +860,16 @@ class flat_tree template void insert_unique(ordered_unique_range_t, BidirIt first, BidirIt last #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) - , typename container_detail::enable_if_c - < !(container_detail::is_input_iterator::value || - container_detail::is_forward_iterator::value) + , typename dtl::enable_if_c + < !(dtl::is_input_iterator::value || + dtl::is_forward_iterator::value) >::type * = 0 #endif ) { - const bool value = boost::container::container_detail:: + const bool value = boost::container::dtl:: has_member_function_callable_with_merge_unique::value; - (flat_tree_merge_unique)(this->m_data.m_seq, first, last, this->priv_value_comp(), container_detail::bool_()); + (flat_tree_merge_unique)(this->m_data.m_seq, first, last, this->priv_value_comp(), dtl::bool_()); } #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) @@ -1069,30 +1069,30 @@ class flat_tree BOOST_CONTAINER_FORCEINLINE iterator nth(size_type n) BOOST_NOEXCEPT_OR_NOTHROW { - const bool value = boost::container::container_detail:: + const bool value = boost::container::dtl:: has_member_function_callable_with_nth::value; - return flat_tree_nth(this->m_data.m_seq, n, container_detail::bool_()); + return flat_tree_nth(this->m_data.m_seq, n, dtl::bool_()); } BOOST_CONTAINER_FORCEINLINE const_iterator nth(size_type n) const BOOST_NOEXCEPT_OR_NOTHROW { - const bool value = boost::container::container_detail:: + const bool value = boost::container::dtl:: has_member_function_callable_with_nth::value; - return flat_tree_nth(this->m_data.m_seq, n, container_detail::bool_()); + return flat_tree_nth(this->m_data.m_seq, n, dtl::bool_()); } BOOST_CONTAINER_FORCEINLINE size_type index_of(iterator p) BOOST_NOEXCEPT_OR_NOTHROW { - const bool value = boost::container::container_detail:: + const bool value = boost::container::dtl:: has_member_function_callable_with_index_of::value; - return flat_tree_index_of(this->m_data.m_seq, p, container_detail::bool_()); + return flat_tree_index_of(this->m_data.m_seq, p, dtl::bool_()); } BOOST_CONTAINER_FORCEINLINE size_type index_of(const_iterator p) const BOOST_NOEXCEPT_OR_NOTHROW { - const bool value = boost::container::container_detail:: + const bool value = boost::container::dtl:: has_member_function_callable_with_index_of::value; - return flat_tree_index_of(this->m_data.m_seq, p, container_detail::bool_()); + return flat_tree_index_of(this->m_data.m_seq, p, dtl::bool_()); } // set operations: @@ -1141,26 +1141,26 @@ class flat_tree BOOST_CONTAINER_FORCEINLINE void merge_unique(flat_tree& source) { - const bool value = boost::container::container_detail:: + const bool value = boost::container::dtl:: has_member_function_callable_with_merge_unique::value; (flat_tree_merge_unique) ( this->m_data.m_seq , boost::make_move_iterator(source.m_data.m_seq.begin()) , boost::make_move_iterator(source.m_data.m_seq.end()) , this->priv_value_comp() - , container_detail::bool_()); + , dtl::bool_()); } BOOST_CONTAINER_FORCEINLINE void merge_equal(flat_tree& source) { - const bool value = boost::container::container_detail:: + const bool value = boost::container::dtl:: has_member_function_callable_with_merge::value; (flat_tree_merge_equal) ( this->m_data.m_seq , boost::make_move_iterator(source.m_data.m_seq.begin()) , boost::make_move_iterator(source.m_data.m_seq.end()) , this->priv_value_comp() - , container_detail::bool_()); + , dtl::bool_()); } BOOST_CONTAINER_FORCEINLINE iterator lower_bound(const key_type& k) @@ -1189,16 +1189,16 @@ class flat_tree BOOST_CONTAINER_FORCEINLINE size_type capacity() const { - const bool value = boost::container::container_detail:: + const bool value = boost::container::dtl:: has_member_function_callable_with_capacity::value; - return (flat_tree_capacity)(this->m_data.m_seq, container_detail::bool_()); + return (flat_tree_capacity)(this->m_data.m_seq, dtl::bool_()); } BOOST_CONTAINER_FORCEINLINE void reserve(size_type cnt) { - const bool value = boost::container::container_detail:: + const bool value = boost::container::dtl:: has_member_function_callable_with_reserve::value; - (flat_tree_reserve)(this->m_data.m_seq, cnt, container_detail::bool_()); + (flat_tree_reserve)(this->m_data.m_seq, cnt, dtl::bool_()); } BOOST_CONTAINER_FORCEINLINE container_type extract_sequence() @@ -1214,13 +1214,13 @@ class flat_tree BOOST_CONTAINER_FORCEINLINE void adopt_sequence_equal(BOOST_RV_REF(container_type) seq) { (flat_tree_adopt_sequence_equal)( m_data.m_seq, boost::move(seq), this->priv_value_comp() - , container_detail::bool_::value>()); + , dtl::bool_::value>()); } BOOST_CONTAINER_FORCEINLINE void adopt_sequence_unique(BOOST_RV_REF(container_type) seq) { (flat_tree_adopt_sequence_unique)(m_data.m_seq, boost::move(seq), this->priv_value_comp() - , container_detail::bool_::value>()); + , dtl::bool_::value>()); } void adopt_sequence_equal(ordered_range_t, BOOST_RV_REF(container_type) seq) @@ -1497,7 +1497,7 @@ class flat_tree } }; -} //namespace container_detail { +} //namespace dtl { } //namespace container { @@ -1505,9 +1505,9 @@ class flat_tree //!specialization for optimizations template -struct has_trivial_destructor_after_move > +struct has_trivial_destructor_after_move > { - typedef typename boost::container::container_detail::select_container_type::type container_type; + typedef typename boost::container::dtl::select_container_type::type container_type; typedef typename container_type::allocator_type allocator_t; typedef typename ::boost::container::allocator_traits::pointer pointer; static const bool value = ::boost::has_trivial_destructor_after_move::value && diff --git a/include/boost/container/detail/is_container.hpp b/include/boost/container/detail/is_container.hpp index 6052f04..feab702 100644 --- a/include/boost/container/detail/is_container.hpp +++ b/include/boost/container/detail/is_container.hpp @@ -36,7 +36,7 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { template struct is_container @@ -48,7 +48,7 @@ struct is_container has_member_function_callable_with_empty::value; }; -} //namespace container_detail { +} //namespace dtl { } //namespace container { } //namespace boost { diff --git a/include/boost/container/detail/is_contiguous_container.hpp b/include/boost/container/detail/is_contiguous_container.hpp index af98c7f..528aeee 100644 --- a/include/boost/container/detail/is_contiguous_container.hpp +++ b/include/boost/container/detail/is_contiguous_container.hpp @@ -28,7 +28,7 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { template struct is_contiguous_container @@ -40,7 +40,7 @@ struct is_contiguous_container has_member_function_callable_with_data::value; }; -} //namespace container_detail { +} //namespace dtl { } //namespace container { } //namespace boost { diff --git a/include/boost/container/detail/is_sorted.hpp b/include/boost/container/detail/is_sorted.hpp index b8c223b..315bab5 100644 --- a/include/boost/container/detail/is_sorted.hpp +++ b/include/boost/container/detail/is_sorted.hpp @@ -20,7 +20,7 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { template bool is_sorted (ForwardIterator first, ForwardIterator last, Pred pred) @@ -50,7 +50,7 @@ bool is_sorted_and_unique (ForwardIterator first, ForwardIterator last, Pred pre return true; } -} //namespace container_detail { +} //namespace dtl { } //namespace container { } //namespace boost { diff --git a/include/boost/container/detail/iterator_to_raw_pointer.hpp b/include/boost/container/detail/iterator_to_raw_pointer.hpp index 8c7c880..49f1d43 100644 --- a/include/boost/container/detail/iterator_to_raw_pointer.hpp +++ b/include/boost/container/detail/iterator_to_raw_pointer.hpp @@ -22,11 +22,11 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { using ::boost::movelib::iterator_to_raw_pointer; -} //namespace container_detail { +} //namespace dtl { } //namespace container { } //namespace boost { diff --git a/include/boost/container/detail/iterators.hpp b/include/boost/container/detail/iterators.hpp index 11ffaae..7ccdac9 100644 --- a/include/boost/container/detail/iterators.hpp +++ b/include/boost/container/detail/iterators.hpp @@ -612,7 +612,7 @@ class emplace_iterator template struct emplace_functor { - typedef typename container_detail::build_number_seq::type index_tuple_t; + typedef typename dtl::build_number_seq::type index_tuple_t; emplace_functor(BOOST_FWD_REF(Args)... args) : args_(args...) @@ -628,21 +628,21 @@ struct emplace_functor private: template - BOOST_CONTAINER_FORCEINLINE void inplace_impl(Allocator &a, T* ptr, const container_detail::index_tuple&) + BOOST_CONTAINER_FORCEINLINE void inplace_impl(Allocator &a, T* ptr, const dtl::index_tuple&) { allocator_traits::construct - (a, ptr, ::boost::forward(container_detail::get(args_))...); + (a, ptr, ::boost::forward(dtl::get(args_))...); } template - BOOST_CONTAINER_FORCEINLINE void inplace_impl(DestIt dest, const container_detail::index_tuple&) + BOOST_CONTAINER_FORCEINLINE void inplace_impl(DestIt dest, const dtl::index_tuple&) { typedef typename boost::container::iterator_traits::value_type value_type; - value_type && tmp= value_type(::boost::forward(container_detail::get(args_))...); + value_type && tmp= value_type(::boost::forward(dtl::get(args_))...); *dest = ::boost::move(tmp); } - container_detail::tuple args_; + dtl::tuple args_; }; template @@ -672,7 +672,7 @@ struct emplace_functor##N\ void operator()(DestIt dest)\ {\ typedef typename boost::container::iterator_traits::value_type value_type;\ - BOOST_MOVE_IF(N, value_type tmp(BOOST_MOVE_MFWD##N), container_detail::value_init tmp) ;\ + BOOST_MOVE_IF(N, value_type tmp(BOOST_MOVE_MFWD##N), dtl::value_init tmp) ;\ *dest = ::boost::move(const_cast(BOOST_MOVE_IF(N, tmp, tmp.get())));\ }\ \ @@ -692,7 +692,7 @@ BOOST_MOVE_ITERATE_0TO9(BOOST_MOVE_ITERATOR_EMPLACE_FUNCTOR_CODE) #endif -namespace container_detail { +namespace dtl { template struct has_iterator_category @@ -863,7 +863,7 @@ class iterator_from_iiterator IIterator m_iit; }; -} //namespace container_detail { +} //namespace dtl { using ::boost::intrusive::reverse_iterator; diff --git a/include/boost/container/detail/math_functions.hpp b/include/boost/container/detail/math_functions.hpp index e499f63..f151931 100644 --- a/include/boost/container/detail/math_functions.hpp +++ b/include/boost/container/detail/math_functions.hpp @@ -32,7 +32,7 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { // Greatest common divisor and least common multiple @@ -114,7 +114,7 @@ inline std::size_t floor_log2 (std::size_t x) return log2; } -} // namespace container_detail +} // namespace dtl } // namespace container } // namespace boost diff --git a/include/boost/container/detail/min_max.hpp b/include/boost/container/detail/min_max.hpp index 7486db7..35cf066 100644 --- a/include/boost/container/detail/min_max.hpp +++ b/include/boost/container/detail/min_max.hpp @@ -20,7 +20,7 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { template const T &max_value(const T &a, const T &b) @@ -30,7 +30,7 @@ template const T &min_value(const T &a, const T &b) { return a < b ? a : b; } -} //namespace container_detail { +} //namespace dtl { } //namespace container { } //namespace boost { diff --git a/include/boost/container/detail/mpl.hpp b/include/boost/container/detail/mpl.hpp index 82fcc70..4bb3cc7 100644 --- a/include/boost/container/detail/mpl.hpp +++ b/include/boost/container/detail/mpl.hpp @@ -30,7 +30,7 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { using boost::move_detail::integral_constant; using boost::move_detail::true_type; @@ -76,7 +76,7 @@ struct select1st { return const_cast(x.first); } }; -} //namespace container_detail { +} //namespace dtl { } //namespace container { } //namespace boost { diff --git a/include/boost/container/detail/multiallocation_chain.hpp b/include/boost/container/detail/multiallocation_chain.hpp index bce1b86..c10f809 100644 --- a/include/boost/container/detail/multiallocation_chain.hpp +++ b/include/boost/container/detail/multiallocation_chain.hpp @@ -35,7 +35,7 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { template class basic_multiallocation_chain @@ -53,7 +53,7 @@ class basic_multiallocation_chain typedef bi::slist< node , bi::linear , bi::cache_last - , bi::size_type::type> + , bi::size_type::type> > slist_impl_t; slist_impl_t slist_impl_; @@ -182,7 +182,7 @@ class basic_multiallocation_chain template struct cast_functor { - typedef typename container_detail::add_reference::type result_type; + typedef typename dtl::add_reference::type result_type; template result_type operator()(U &ptr) const { return *static_cast(static_cast(&ptr)); } @@ -211,7 +211,7 @@ class transform_multiallocation_chain public: typedef transform_iterator < typename MultiallocationChain::iterator - , container_detail::cast_functor > iterator; + , dtl::cast_functor > iterator; typedef typename MultiallocationChain::size_type size_type; transform_multiallocation_chain() @@ -289,7 +289,7 @@ class transform_multiallocation_chain }}} -// namespace container_detail { +// namespace dtl { // namespace container { // namespace boost { diff --git a/include/boost/container/detail/mutex.hpp b/include/boost/container/detail/mutex.hpp index 9743614..56e72a8 100644 --- a/include/boost/container/detail/mutex.hpp +++ b/include/boost/container/detail/mutex.hpp @@ -171,7 +171,7 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { #if BOOST_MUTEX_HELPER == BOOST_MUTEX_HELPER_NONE class null_mutex @@ -268,7 +268,7 @@ class scoped_lock Mutex &m_; }; -} // namespace container_detail +} // namespace dtl } // namespace container } // namespace boost diff --git a/include/boost/container/detail/next_capacity.hpp b/include/boost/container/detail/next_capacity.hpp index 3bc98a3..464e8d8 100644 --- a/include/boost/container/detail/next_capacity.hpp +++ b/include/boost/container/detail/next_capacity.hpp @@ -25,7 +25,7 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { enum NextCapacityOption { NextCapacityDouble, NextCapacity60Percent }; @@ -68,7 +68,7 @@ struct next_capacity_calculator } }; -} //namespace container_detail { +} //namespace dtl { } //namespace container { } //namespace boost { diff --git a/include/boost/container/detail/node_alloc_holder.hpp b/include/boost/container/detail/node_alloc_holder.hpp index b6e602e..ad7b713 100644 --- a/include/boost/container/detail/node_alloc_holder.hpp +++ b/include/boost/container/detail/node_alloc_holder.hpp @@ -50,7 +50,7 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { BOOST_INTRUSIVE_INSTANTIATE_DEFAULT_TYPE_TMPLT(value_compare) BOOST_INTRUSIVE_INSTANTIATE_DEFAULT_TYPE_TMPLT(predicate_type) @@ -61,14 +61,14 @@ struct node_alloc_holder //If the intrusive container is an associative container, obtain the predicate, which will //be of type node_compare<>. If not an associative container value_compare will be a "nat" type. typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT - ( boost::container::container_detail:: - , ICont, value_compare, container_detail::nat) intrusive_value_compare; + ( boost::container::dtl:: + , ICont, value_compare, dtl::nat) intrusive_value_compare; //In that case obtain the value predicate from the node predicate via predicate_type //if intrusive_value_compare is node_compare<>, nat otherwise typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT - ( boost::container::container_detail:: + ( boost::container::dtl:: , intrusive_value_compare - , predicate_type, container_detail::nat) value_compare; + , predicate_type, dtl::nat) value_compare; typedef allocator_traits allocator_traits_type; typedef typename allocator_traits_type::value_type value_type; @@ -77,14 +77,14 @@ struct node_alloc_holder typedef typename allocator_traits_type::template portable_rebind_alloc::type NodeAlloc; typedef allocator_traits node_allocator_traits_type; - typedef container_detail::allocator_version_traits node_allocator_version_traits_type; + typedef dtl::allocator_version_traits node_allocator_version_traits_type; typedef Allocator ValAlloc; typedef typename node_allocator_traits_type::pointer NodePtr; - typedef container_detail::scoped_deallocator Deallocator; + typedef dtl::scoped_deallocator Deallocator; typedef typename node_allocator_traits_type::size_type size_type; typedef typename node_allocator_traits_type::difference_type difference_type; - typedef container_detail::integral_constant::value> alloc_version; typedef typename ICont::iterator icont_iterator; typedef typename ICont::const_iterator icont_citerator; @@ -134,15 +134,15 @@ struct node_alloc_holder void copy_assign_alloc(const node_alloc_holder &x) { - container_detail::bool_ flag; - container_detail::assign_alloc( static_cast(this->members_) + dtl::bool_ flag; + dtl::assign_alloc( static_cast(this->members_) , static_cast(x.members_), flag); } void move_assign_alloc( node_alloc_holder &x) { - container_detail::bool_ flag; - container_detail::move_alloc( static_cast(this->members_) + dtl::bool_ flag; + dtl::move_alloc( static_cast(this->members_) , static_cast(x.members_), flag); } @@ -167,7 +167,7 @@ struct node_alloc_holder Deallocator node_deallocator(p, this->node_alloc()); allocator_traits::construct ( this->node_alloc() - , container_detail::addressof(p->m_data), boost::forward(args)...); + , dtl::addressof(p->m_data), boost::forward(args)...); node_deallocator.release(); //This does not throw typedef typename Node::hook_type hook_type; @@ -185,7 +185,7 @@ struct node_alloc_holder Deallocator node_deallocator(p, this->node_alloc());\ allocator_traits::construct\ ( this->node_alloc()\ - , container_detail::addressof(p->m_data)\ + , dtl::addressof(p->m_data)\ BOOST_MOVE_I##N BOOST_MOVE_FWD##N);\ node_deallocator.release();\ typedef typename Node::hook_type hook_type;\ @@ -203,7 +203,7 @@ struct node_alloc_holder { NodePtr p = this->allocate_one(); Deallocator node_deallocator(p, this->node_alloc()); - ::boost::container::construct_in_place(this->node_alloc(), container_detail::addressof(p->m_data), it); + ::boost::container::construct_in_place(this->node_alloc(), dtl::addressof(p->m_data), it); node_deallocator.release(); //This does not throw typedef typename Node::hook_type hook_type; @@ -218,12 +218,12 @@ struct node_alloc_holder NodeAlloc &na = this->node_alloc(); Deallocator node_deallocator(p, this->node_alloc()); node_allocator_traits_type::construct - (na, container_detail::addressof(p->m_data.first), boost::forward(key)); + (na, dtl::addressof(p->m_data.first), boost::forward(key)); BOOST_TRY{ - node_allocator_traits_type::construct(na, container_detail::addressof(p->m_data.second)); + node_allocator_traits_type::construct(na, dtl::addressof(p->m_data.second)); } BOOST_CATCH(...){ - node_allocator_traits_type::destroy(na, container_detail::addressof(p->m_data.first)); + node_allocator_traits_type::destroy(na, dtl::addressof(p->m_data.first)); BOOST_RETHROW; } BOOST_CATCH_END @@ -243,8 +243,8 @@ struct node_alloc_holder void swap(node_alloc_holder &x) { this->icont().swap(x.icont()); - container_detail::bool_ flag; - container_detail::swap_alloc(this->node_alloc(), x.node_alloc(), flag); + dtl::bool_ flag; + dtl::swap_alloc(this->node_alloc(), x.node_alloc(), flag); } template @@ -264,13 +264,13 @@ struct node_alloc_holder Node *p = 0; BOOST_TRY{ Deallocator node_deallocator(NodePtr(), nalloc); - container_detail::scoped_destructor sdestructor(nalloc, 0); + dtl::scoped_destructor sdestructor(nalloc, 0); while(n--){ p = boost::movelib::iterator_to_raw_pointer(itbeg); node_deallocator.set(p); ++itbeg; //This can throw - boost::container::construct_in_place(nalloc, container_detail::addressof(p->m_data), beg); + boost::container::construct_in_place(nalloc, dtl::addressof(p->m_data), beg); sdestructor.set(p); ++beg; //This does not throw @@ -410,7 +410,7 @@ struct node_alloc_holder { return this->members_.m_icont; } }; -} //namespace container_detail { +} //namespace dtl { } //namespace container { } //namespace boost { diff --git a/include/boost/container/detail/node_pool.hpp b/include/boost/container/detail/node_pool.hpp index 00e35df..e43956b 100644 --- a/include/boost/container/detail/node_pool.hpp +++ b/include/boost/container/detail/node_pool.hpp @@ -32,7 +32,7 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { //!Pooled memory allocator using single segregated storage. Includes //!a reference count but the class does not delete itself, this is @@ -41,10 +41,10 @@ namespace container_detail { template< std::size_t NodeSize, std::size_t NodesPerBlock > class private_node_pool //Inherit from the implementation to avoid template bloat - : public boost::container::container_detail:: + : public boost::container::dtl:: private_node_pool_impl { - typedef boost::container::container_detail:: + typedef boost::container::dtl:: private_node_pool_impl base_t; //Non-copyable private_node_pool(const private_node_pool &); @@ -148,7 +148,7 @@ class shared_node_pool default_mutex mutex_; }; -} //namespace container_detail { +} //namespace dtl { } //namespace container { } //namespace boost { diff --git a/include/boost/container/detail/node_pool_impl.hpp b/include/boost/container/detail/node_pool_impl.hpp index 024bf30..97f555b 100644 --- a/include/boost/container/detail/node_pool_impl.hpp +++ b/include/boost/container/detail/node_pool_impl.hpp @@ -38,7 +38,7 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { template class private_node_pool_impl @@ -366,7 +366,7 @@ class private_node_pool_impl }; -} //namespace container_detail { +} //namespace dtl { } //namespace container { } //namespace boost { diff --git a/include/boost/container/detail/pair.hpp b/include/boost/container/detail/pair.hpp index 4755e56..6b00db1 100644 --- a/include/boost/container/detail/pair.hpp +++ b/include/boost/container/detail/pair.hpp @@ -74,7 +74,7 @@ struct is_boost_tuple< boost::tuples::tuple struct disable_if_boost_tuple - : boost::container::container_detail::disable_if< is_boost_tuple > + : boost::container::dtl::disable_if< is_boost_tuple > {}; template @@ -133,7 +133,7 @@ static piecewise_construct_t piecewise_construct = BOOST_CONTAINER_DOC1ST(unspec ///@cond -namespace container_detail { +namespace dtl { struct piecewise_construct_use { @@ -283,7 +283,7 @@ struct pair pair( piecewise_construct_t\ , BoostTuple p\ , BoostTuple q\ - , typename container_detail::enable_if_c\ + , typename dtl::enable_if_c\ < pair_impl::is_boost_tuple< BoostTuple >::value &&\ !(pair_impl::is_tuple_null::value || pair_impl::is_tuple_null::value) \ >::type* = 0\ @@ -381,10 +381,10 @@ struct pair } template - typename ::boost::container::container_detail::disable_if_or + typename ::boost::container::dtl::disable_if_or < pair & - , ::boost::container::container_detail::is_same - , ::boost::container::container_detail::is_same + , ::boost::container::dtl::is_same + , ::boost::container::dtl::is_same >::type operator=(const pair&p) { @@ -394,10 +394,10 @@ struct pair } template - typename ::boost::container::container_detail::disable_if_or + typename ::boost::container::dtl::disable_if_or < pair & - , ::boost::container::container_detail::is_same - , ::boost::container::container_detail::is_same + , ::boost::container::dtl::is_same + , ::boost::container::dtl::is_same >::type operator=(BOOST_RV_REF_BEG pair BOOST_RV_REF_END p) { @@ -478,13 +478,13 @@ template inline void swap(pair& x, pair& y) { x.swap(y); } -} //namespace container_detail { +} //namespace dtl { } //namespace container { #ifdef BOOST_NO_CXX11_RVALUE_REFERENCES template -struct has_move_emulation_enabled< ::boost::container::container_detail::pair > +struct has_move_emulation_enabled< ::boost::container::dtl::pair > { static const bool value = true; }; @@ -497,7 +497,7 @@ template struct is_class_or_union; template -struct is_class_or_union< ::boost::container::container_detail::pair > +struct is_class_or_union< ::boost::container::dtl::pair > //This specialization is needed to avoid instantiation of pair in //is_class, and allow recursive maps. { @@ -516,7 +516,7 @@ template struct is_union; template -struct is_union< ::boost::container::container_detail::pair > +struct is_union< ::boost::container::dtl::pair > //This specialization is needed to avoid instantiation of pair in //is_class, and allow recursive maps. { @@ -535,7 +535,7 @@ template struct is_class; template -struct is_class< ::boost::container::container_detail::pair > +struct is_class< ::boost::container::dtl::pair > //This specialization is needed to avoid instantiation of pair in //is_class, and allow recursive maps. { diff --git a/include/boost/container/detail/pool_common.hpp b/include/boost/container/detail/pool_common.hpp index 61d0612..f42c1dd 100644 --- a/include/boost/container/detail/pool_common.hpp +++ b/include/boost/container/detail/pool_common.hpp @@ -26,7 +26,7 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { template struct node_slist @@ -48,7 +48,7 @@ struct is_stateless_segment_manager static const bool value = false; }; -} //namespace container_detail { +} //namespace dtl { } //namespace container { } //namespace boost { diff --git a/include/boost/container/detail/pool_common_alloc.hpp b/include/boost/container/detail/pool_common_alloc.hpp index 3a3c80a..bfb82f5 100644 --- a/include/boost/container/detail/pool_common_alloc.hpp +++ b/include/boost/container/detail/pool_common_alloc.hpp @@ -30,10 +30,10 @@ namespace boost{ namespace container{ -namespace container_detail{ +namespace dtl{ struct node_slist_helper - : public boost::container::container_detail::node_slist + : public boost::container::dtl::node_slist {}; struct fake_segment_manager @@ -41,7 +41,7 @@ struct fake_segment_manager typedef void * void_pointer; static const std::size_t PayloadPerAllocation = BOOST_CONTAINER_ALLOCATION_PAYLOAD; - typedef boost::container::container_detail:: + typedef boost::container::dtl:: basic_multiallocation_chain multiallocation_chain; static void deallocate(void_pointer p) { dlmalloc_free(p); } @@ -77,23 +77,23 @@ struct fake_segment_manager } //namespace boost{ } //namespace container{ -} //namespace container_detail{ +} //namespace dtl{ namespace boost { namespace container { -namespace container_detail { +namespace dtl { template struct is_stateless_segment_manager; template<> struct is_stateless_segment_manager - + { static const bool value = true; }; -} //namespace container_detail { +} //namespace dtl { } //namespace container { } //namespace boost { diff --git a/include/boost/container/detail/singleton.hpp b/include/boost/container/detail/singleton.hpp index 6fd6a54..7601c3c 100644 --- a/include/boost/container/detail/singleton.hpp +++ b/include/boost/container/detail/singleton.hpp @@ -69,7 +69,7 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { // T must be: no-throw default constructible and no-throw destructible template @@ -112,7 +112,7 @@ template typename singleton_default::object_creator singleton_default::create_object; -} // namespace container_detail +} // namespace dtl } // namespace container } // namespace boost diff --git a/include/boost/container/detail/transform_iterator.hpp b/include/boost/container/detail/transform_iterator.hpp index ba64c7d..ce81813 100644 --- a/include/boost/container/detail/transform_iterator.hpp +++ b/include/boost/container/detail/transform_iterator.hpp @@ -63,7 +63,7 @@ class transform_iterator : public UnaryFunction , public boost::container::iterator < typename Iterator::iterator_category - , typename container_detail::remove_reference::type + , typename dtl::remove_reference::type , typename Iterator::difference_type , operator_arrow_proxy , typename UnaryFunction::result_type> diff --git a/include/boost/container/detail/tree.hpp b/include/boost/container/detail/tree.hpp index 99baf3a..0ea5769 100644 --- a/include/boost/container/detail/tree.hpp +++ b/include/boost/container/detail/tree.hpp @@ -61,7 +61,7 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { using boost::intrusive::tree_value_compare; @@ -71,38 +71,38 @@ struct intrusive_tree_hook; template struct intrusive_tree_hook { - typedef typename container_detail::bi::make_set_base_hook - < container_detail::bi::void_pointer - , container_detail::bi::link_mode - , container_detail::bi::optimize_size + typedef typename dtl::bi::make_set_base_hook + < dtl::bi::void_pointer + , dtl::bi::link_mode + , dtl::bi::optimize_size >::type type; }; template struct intrusive_tree_hook { - typedef typename container_detail::bi::make_avl_set_base_hook - < container_detail::bi::void_pointer - , container_detail::bi::link_mode - , container_detail::bi::optimize_size + typedef typename dtl::bi::make_avl_set_base_hook + < dtl::bi::void_pointer + , dtl::bi::link_mode + , dtl::bi::optimize_size >::type type; }; template struct intrusive_tree_hook { - typedef typename container_detail::bi::make_bs_set_base_hook - < container_detail::bi::void_pointer - , container_detail::bi::link_mode + typedef typename dtl::bi::make_bs_set_base_hook + < dtl::bi::void_pointer + , dtl::bi::link_mode >::type type; }; template struct intrusive_tree_hook { - typedef typename container_detail::bi::make_bs_set_base_hook - < container_detail::bi::void_pointer - , container_detail::bi::link_mode + typedef typename dtl::bi::make_bs_set_base_hook + < dtl::bi::void_pointer + , dtl::bi::link_mode >::type type; }; @@ -222,9 +222,9 @@ class push_back_functor { this->icont_.push_back(n); } }; -}//namespace container_detail { +}//namespace dtl { -namespace container_detail { +namespace dtl { template< class NodeType, class NodeCompareType , class SizeType, class HookType @@ -235,12 +235,12 @@ template struct intrusive_tree_dispatch { - typedef typename container_detail::bi::make_rbtree + typedef typename dtl::bi::make_rbtree - ,container_detail::bi::base_hook - ,container_detail::bi::constant_time_size - ,container_detail::bi::size_type + ,dtl::bi::compare + ,dtl::bi::base_hook + ,dtl::bi::constant_time_size + ,dtl::bi::size_type >::type type; }; @@ -248,12 +248,12 @@ template struct intrusive_tree_dispatch { - typedef typename container_detail::bi::make_avltree + typedef typename dtl::bi::make_avltree - ,container_detail::bi::base_hook - ,container_detail::bi::constant_time_size - ,container_detail::bi::size_type + ,dtl::bi::compare + ,dtl::bi::base_hook + ,dtl::bi::constant_time_size + ,dtl::bi::size_type >::type type; }; @@ -261,12 +261,12 @@ template struct intrusive_tree_dispatch { - typedef typename container_detail::bi::make_sgtree + typedef typename dtl::bi::make_sgtree - ,container_detail::bi::base_hook - ,container_detail::bi::floating_point - ,container_detail::bi::size_type + ,dtl::bi::compare + ,dtl::bi::base_hook + ,dtl::bi::floating_point + ,dtl::bi::size_type >::type type; }; @@ -274,12 +274,12 @@ template struct intrusive_tree_dispatch { - typedef typename container_detail::bi::make_splaytree + typedef typename dtl::bi::make_splaytree - ,container_detail::bi::base_hook - ,container_detail::bi::constant_time_size - ,container_detail::bi::size_type + ,dtl::bi::compare + ,dtl::bi::base_hook + ,dtl::bi::constant_time_size + ,dtl::bi::size_type >::type type; }; @@ -293,7 +293,7 @@ struct intrusive_tree_type allocator_traits::void_pointer void_pointer; typedef typename boost::container:: allocator_traits::size_type size_type; - typedef typename container_detail::tree_node + typedef typename dtl::tree_node < value_type, void_pointer , tree_type_value, OptimizeSize> node_t; typedef value_to_node_compare @@ -340,9 +340,9 @@ struct intrusive_tree_proxy { c.rebalance(); } }; -} //namespace container_detail { +} //namespace dtl { -namespace container_detail { +namespace dtl { //This functor will be used with Intrusive clone functions to obtain //already allocated nodes from a intrusive container instead of @@ -433,9 +433,9 @@ template class tree - : public container_detail::node_alloc_holder + : public dtl::node_alloc_holder < Allocator - , typename container_detail::intrusive_tree_type + , typename dtl::intrusive_tree_type < Allocator, tree_value_compare ::pointer, Compare, KeyOfValue> , Options::tree_type, Options::optimize_size>::type @@ -444,10 +444,10 @@ class tree typedef tree_value_compare < typename allocator_traits::pointer , Compare, KeyOfValue> ValComp; - typedef typename container_detail::intrusive_tree_type + typedef typename dtl::intrusive_tree_type < Allocator, ValComp, Options::tree_type , Options::optimize_size>::type Icont; - typedef container_detail::node_alloc_holder + typedef dtl::node_alloc_holder AllocHolder; typedef typename AllocHolder::NodePtr NodePtr; typedef tree < T, KeyOfValue @@ -459,7 +459,7 @@ class tree typedef typename AllocHolder::Node Node; typedef typename Icont::iterator iiterator; typedef typename Icont::const_iterator iconst_iterator; - typedef container_detail::allocator_destroyer Destroyer; + typedef dtl::allocator_destroyer Destroyer; typedef typename AllocHolder::alloc_version alloc_version; typedef intrusive_tree_proxy intrusive_tree_proxy_t; @@ -484,9 +484,9 @@ class tree allocator_traits::size_type size_type; typedef typename boost::container:: allocator_traits::difference_type difference_type; - typedef container_detail::iterator_from_iiterator + typedef dtl::iterator_from_iiterator iterator; - typedef container_detail::iterator_from_iiterator + typedef dtl::iterator_from_iiterator const_iterator; typedef boost::container::reverse_iterator reverse_iterator; @@ -590,10 +590,10 @@ class tree template void tree_construct_non_unique(InputIterator first, InputIterator last #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) - , typename container_detail::enable_if_or + , typename dtl::enable_if_or < void - , container_detail::is_same - , container_detail::is_input_iterator + , dtl::is_same + , dtl::is_input_iterator >::type * = 0 #endif ) @@ -610,10 +610,10 @@ class tree template void tree_construct_non_unique(InputIterator first, InputIterator last #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) - , typename container_detail::disable_if_or + , typename dtl::disable_if_or < void - , container_detail::is_same - , container_detail::is_input_iterator + , dtl::is_same + , dtl::is_input_iterator >::type * = 0 #endif ) @@ -627,10 +627,10 @@ class tree template void tree_construct( ordered_range_t, InputIterator first, InputIterator last #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) - , typename container_detail::disable_if_or + , typename dtl::disable_if_or < void - , container_detail::is_same - , container_detail::is_input_iterator + , dtl::is_same + , dtl::is_input_iterator >::type * = 0 #endif ) @@ -638,17 +638,17 @@ class tree //Optimized allocation and construction this->allocate_many_and_construct ( first, boost::container::iterator_distance(first, last) - , container_detail::push_back_functor(this->icont())); + , dtl::push_back_functor(this->icont())); //AllocHolder clears in case of exception } template void tree_construct( ordered_range_t, InputIterator first, InputIterator last #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) - , typename container_detail::enable_if_or + , typename dtl::enable_if_or < void - , container_detail::is_same - , container_detail::is_input_iterator + , dtl::is_same + , dtl::is_input_iterator >::type * = 0 #endif ) @@ -668,7 +668,7 @@ class tree } BOOST_CONTAINER_FORCEINLINE tree(BOOST_RV_REF(tree) x) - BOOST_NOEXCEPT_IF(boost::container::container_detail::is_nothrow_move_constructible::value) + BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_constructible::value) : AllocHolder(BOOST_MOVE_BASE(AllocHolder, x), x.value_comp()) {} @@ -701,7 +701,7 @@ class tree if (&x != this){ NodeAlloc &this_alloc = this->get_stored_allocator(); const NodeAlloc &x_alloc = x.get_stored_allocator(); - container_detail::bool_:: + dtl::bool_:: propagate_on_container_copy_assignment::value> flag; if(flag && this_alloc != x_alloc){ this->clear(); @@ -730,7 +730,7 @@ class tree tree& operator=(BOOST_RV_REF(tree) x) BOOST_NOEXCEPT_IF( (allocator_traits_type::propagate_on_container_move_assignment::value || allocator_traits_type::is_always_equal::value) && - boost::container::container_detail::is_nothrow_move_assignable::value) + boost::container::dtl::is_nothrow_move_assignable::value) { BOOST_ASSERT(this != &x); NodeAlloc &this_alloc = this->node_alloc(); @@ -856,7 +856,7 @@ class tree BOOST_CONTAINER_FORCEINLINE void swap(ThisType& x) BOOST_NOEXCEPT_IF( allocator_traits_type::is_always_equal::value - && boost::container::container_detail::is_nothrow_swappable::value ) + && boost::container::dtl::is_nothrow_swappable::value ) { AllocHolder::swap(x); } public: @@ -1315,7 +1315,7 @@ class tree { x.swap(y); } }; -} //namespace container_detail { +} //namespace dtl { } //namespace container { template @@ -1326,7 +1326,7 @@ struct has_trivial_destructor_after_move; template struct has_trivial_destructor_after_move < - ::boost::container::container_detail::tree + ::boost::container::dtl::tree > { diff --git a/include/boost/container/detail/type_traits.hpp b/include/boost/container/detail/type_traits.hpp index e1453a6..686cc40 100644 --- a/include/boost/container/detail/type_traits.hpp +++ b/include/boost/container/detail/type_traits.hpp @@ -28,7 +28,7 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { using ::boost::move_detail::enable_if; using ::boost::move_detail::enable_if_and; @@ -63,7 +63,7 @@ using ::boost::move_detail::aligned_storage; using ::boost::move_detail::nat; using ::boost::move_detail::max_align_t; -} //namespace container_detail { +} //namespace dtl { } //namespace container { } //namespace boost { diff --git a/include/boost/container/detail/value_init.hpp b/include/boost/container/detail/value_init.hpp index faba70e..35b0aa1 100644 --- a/include/boost/container/detail/value_init.hpp +++ b/include/boost/container/detail/value_init.hpp @@ -26,7 +26,7 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { template struct value_init @@ -42,7 +42,7 @@ struct value_init T m_t; }; -} //namespace container_detail { +} //namespace dtl { } //namespace container { } //namespace boost { diff --git a/include/boost/container/detail/variadic_templates_tools.hpp b/include/boost/container/detail/variadic_templates_tools.hpp index e9fa9cd..1e6f3df 100644 --- a/include/boost/container/detail/variadic_templates_tools.hpp +++ b/include/boost/container/detail/variadic_templates_tools.hpp @@ -28,7 +28,7 @@ namespace boost { namespace container { -namespace container_detail { +namespace dtl { template class tuple; @@ -156,7 +156,7 @@ struct build_number_seq template<> struct build_number_seq<0> : index_tuple<>{}; template<> struct build_number_seq<1> : index_tuple<0>{}; -}}} //namespace boost { namespace container { namespace container_detail { +}}} //namespace boost { namespace container { namespace dtl { #include diff --git a/include/boost/container/detail/version_type.hpp b/include/boost/container/detail/version_type.hpp index a20b3ee..c2531cc 100644 --- a/include/boost/container/detail/version_type.hpp +++ b/include/boost/container/detail/version_type.hpp @@ -32,11 +32,11 @@ namespace boost{ namespace container { -namespace container_detail { +namespace dtl { template struct version_type - : public container_detail::integral_constant + : public dtl::integral_constant { typedef T type; @@ -46,7 +46,7 @@ struct version_type namespace impl{ template , typename T::version>::value> + bool = dtl::is_convertible, typename T::version>::value> struct extract_version { static const unsigned value = 1; @@ -86,7 +86,7 @@ struct version template struct version - : public container_detail::integral_constant::value> + : public dtl::integral_constant::value> {}; template @@ -96,11 +96,11 @@ struct is_version is_same< typename version::type, integral_constant >::value; }; -} //namespace container_detail { +} //namespace dtl { -typedef container_detail::integral_constant version_0; -typedef container_detail::integral_constant version_1; -typedef container_detail::integral_constant version_2; +typedef dtl::integral_constant version_0; +typedef dtl::integral_constant version_1; +typedef dtl::integral_constant version_2; } //namespace container { } //namespace boost{ diff --git a/include/boost/container/flat_map.hpp b/include/boost/container/flat_map.hpp index d87f7bd..d489d37 100644 --- a/include/boost/container/flat_map.hpp +++ b/include/boost/container/flat_map.hpp @@ -57,7 +57,7 @@ namespace container { template class flat_multimap; -namespace container_detail{ +namespace dtl{ template BOOST_CONTAINER_FORCEINLINE static D &force(S &s) @@ -71,7 +71,7 @@ BOOST_CONTAINER_FORCEINLINE static D force_copy(const S &s) return ret_val; } -} //namespace container_detail{ +} //namespace dtl{ #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED @@ -115,18 +115,18 @@ class flat_map private: BOOST_COPYABLE_AND_MOVABLE(flat_map) //This is the tree that we should store if pair was movable - typedef container_detail::flat_tree< + typedef dtl::flat_tree< std::pair, - container_detail::select1st, + dtl::select1st, Compare, AllocatorOrContainer> tree_t; //This is the real tree stored here. It's based on a movable pair - typedef container_detail::flat_tree< - container_detail::pair, - container_detail::select1st, + typedef dtl::flat_tree< + dtl::pair, + dtl::select1st, Compare, - typename container_detail::container_or_allocator_rebind >::type + typename dtl::container_or_allocator_rebind >::type > impl_tree_t; impl_tree_t m_flat_tree; // flat tree representing flat_map @@ -138,9 +138,9 @@ class flat_map typedef std::initializer_list impl_initializer_list; #endif - typedef container_detail::flat_tree_value_compare + typedef dtl::flat_tree_value_compare < Compare - , container_detail::select1st + , dtl::select1st , std::pair > value_compare_t; typedef typename tree_t::iterator iterator_t; typedef typename tree_t::const_iterator const_iterator_t; @@ -195,7 +195,7 @@ class flat_map typedef BOOST_CONTAINER_IMPDEF(impl_value_type) movable_value_type; //AllocatorOrContainer::value_type must be std::pair - BOOST_STATIC_ASSERT((container_detail::is_same, typename allocator_type::value_type>::value)); + BOOST_STATIC_ASSERT((dtl::is_same, typename allocator_type::value_type>::value)); ////////////////////////////////////////////// // @@ -206,8 +206,8 @@ class flat_map //! Effects: Default constructs an empty flat_map. //! //! Complexity: Constant. - BOOST_CONTAINER_FORCEINLINE flat_map() BOOST_NOEXCEPT_IF(container_detail::is_nothrow_default_constructible::value && - container_detail::is_nothrow_default_constructible::value) + BOOST_CONTAINER_FORCEINLINE flat_map() BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible::value && + dtl::is_nothrow_default_constructible::value) : m_flat_tree() {} @@ -215,7 +215,7 @@ class flat_map //! //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE explicit flat_map(const allocator_type& a) - : m_flat_tree(container_detail::force(a)) + : m_flat_tree(dtl::force(a)) {} //! Effects: Constructs an empty flat_map using the specified @@ -231,7 +231,7 @@ class flat_map //! //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE flat_map(const Compare& comp, const allocator_type& a) - : m_flat_tree(comp, container_detail::force(a)) + : m_flat_tree(comp, dtl::force(a)) {} //! Effects: Constructs an empty flat_map and @@ -251,7 +251,7 @@ class flat_map //! the predicate and otherwise N logN, where N is last - first. template BOOST_CONTAINER_FORCEINLINE flat_map(InputIterator first, InputIterator last, const allocator_type& a) - : m_flat_tree(true, first, last, container_detail::force(a)) + : m_flat_tree(true, first, last, dtl::force(a)) {} //! Effects: Constructs an empty flat_map using the specified comparison object and @@ -271,7 +271,7 @@ class flat_map //! the predicate and otherwise N logN, where N is last - first. template BOOST_CONTAINER_FORCEINLINE flat_map(InputIterator first, InputIterator last, const Compare& comp, const allocator_type& a) - : m_flat_tree(true, first, last, comp, container_detail::force(a)) + : m_flat_tree(true, first, last, comp, dtl::force(a)) {} //! Effects: Constructs an empty flat_map @@ -316,7 +316,7 @@ class flat_map template BOOST_CONTAINER_FORCEINLINE flat_map(ordered_unique_range_t, InputIterator first, InputIterator last, const Compare& comp, const allocator_type& a) - : m_flat_tree(ordered_range, first, last, comp, container_detail::force(a)) + : m_flat_tree(ordered_range, first, last, comp, dtl::force(a)) {} #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST) @@ -327,8 +327,8 @@ class flat_map //! the predicate and otherwise N logN, where N is last - first. BOOST_CONTAINER_FORCEINLINE flat_map(std::initializer_list il) : m_flat_tree( true - , container_detail::force(il).begin() - , container_detail::force(il).end()) + , dtl::force(il).begin() + , dtl::force(il).end()) {} //! Effects: Constructs an empty flat_map using the specified @@ -338,9 +338,9 @@ class flat_map //! the predicate and otherwise N logN, where N is last - first. BOOST_CONTAINER_FORCEINLINE flat_map(std::initializer_list il, const allocator_type& a) : m_flat_tree( true - , container_detail::force(il).begin() - , container_detail::force(il).end() - , container_detail::force(a)) + , dtl::force(il).begin() + , dtl::force(il).end() + , dtl::force(a)) {} //! Effects: Constructs an empty flat_map using the specified comparison object and @@ -350,8 +350,8 @@ class flat_map //! the predicate and otherwise N logN, where N is last - first. BOOST_CONTAINER_FORCEINLINE flat_map(std::initializer_list il, const Compare& comp) : m_flat_tree(true - , container_detail::force(il).begin() - , container_detail::force(il).end() + , dtl::force(il).begin() + , dtl::force(il).end() , comp) {} @@ -362,10 +362,10 @@ class flat_map //! the predicate and otherwise N logN, where N is last - first. BOOST_CONTAINER_FORCEINLINE flat_map(std::initializer_list il, const Compare& comp, const allocator_type& a) : m_flat_tree(true - , container_detail::force(il).begin() - , container_detail::force(il).end() + , dtl::force(il).begin() + , dtl::force(il).end() , comp - , container_detail::force(a)) + , dtl::force(a)) {} //! Effects: Constructs an empty flat_map using and @@ -380,8 +380,8 @@ class flat_map //! Note: Non-standard extension. BOOST_CONTAINER_FORCEINLINE flat_map(ordered_unique_range_t, std::initializer_list il) : m_flat_tree(ordered_unique_range - , container_detail::force(il).begin() - , container_detail::force(il).end()) + , dtl::force(il).begin() + , dtl::force(il).end()) {} //! Effects: Constructs an empty flat_map using the specified comparison object and @@ -396,8 +396,8 @@ class flat_map //! Note: Non-standard extension. BOOST_CONTAINER_FORCEINLINE flat_map(ordered_unique_range_t, std::initializer_list il, const Compare& comp) : m_flat_tree(ordered_unique_range - , container_detail::force(il).begin() - , container_detail::force(il).end() + , dtl::force(il).begin() + , dtl::force(il).end() , comp) {} @@ -413,10 +413,10 @@ class flat_map //! Note: Non-standard extension. BOOST_CONTAINER_FORCEINLINE flat_map(ordered_unique_range_t, std::initializer_list il, const Compare& comp, const allocator_type& a) : m_flat_tree( ordered_unique_range - , container_detail::force(il).begin() - , container_detail::force(il).end() + , dtl::force(il).begin() + , dtl::force(il).end() , comp - , container_detail::force(a)) + , dtl::force(a)) {} #endif @@ -434,7 +434,7 @@ class flat_map //! //! Postcondition: x is emptied. BOOST_CONTAINER_FORCEINLINE flat_map(BOOST_RV_REF(flat_map) x) - BOOST_NOEXCEPT_IF(boost::container::container_detail::is_nothrow_move_constructible::value) + BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_constructible::value) : m_flat_tree(boost::move(x.m_flat_tree)) {} @@ -442,7 +442,7 @@ class flat_map //! //! Complexity: Linear in x.size(). BOOST_CONTAINER_FORCEINLINE flat_map(const flat_map& x, const allocator_type &a) - : m_flat_tree(x.m_flat_tree, container_detail::force(a)) + : m_flat_tree(x.m_flat_tree, dtl::force(a)) {} //! Effects: Move constructs a flat_map using the specified allocator. @@ -450,7 +450,7 @@ class flat_map //! //! Complexity: Constant if x.get_allocator() == a, linear otherwise. BOOST_CONTAINER_FORCEINLINE flat_map(BOOST_RV_REF(flat_map) x, const allocator_type &a) - : m_flat_tree(boost::move(x.m_flat_tree), container_detail::force(a)) + : m_flat_tree(boost::move(x.m_flat_tree), dtl::force(a)) {} //! Effects: Makes *this a copy of x. @@ -471,7 +471,7 @@ class flat_map BOOST_CONTAINER_FORCEINLINE flat_map& operator=(BOOST_RV_REF(flat_map) x) BOOST_NOEXCEPT_IF( (allocator_traits_type::propagate_on_container_move_assignment::value || allocator_traits_type::is_always_equal::value) && - boost::container::container_detail::is_nothrow_move_assignable::value) + boost::container::dtl::is_nothrow_move_assignable::value) { m_flat_tree = boost::move(x.m_flat_tree); return *this; } #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST) @@ -489,7 +489,7 @@ class flat_map //! //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE allocator_type get_allocator() const BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.get_allocator()); } + { return dtl::force_copy(m_flat_tree.get_allocator()); } //! Effects: Returns a reference to the internal allocator. //! @@ -501,7 +501,7 @@ class flat_map BOOST_CONTAINER_FORCEINLINE get_stored_allocator_noconst_return_t get_stored_allocator() BOOST_NOEXCEPT_OR_NOTHROW { impl_get_stored_allocator_noconst_return_t r = m_flat_tree.get_stored_allocator(); - return container_detail::force(r); + return dtl::force(r); } //! Effects: Returns a reference to the internal allocator. @@ -514,7 +514,7 @@ class flat_map BOOST_CONTAINER_FORCEINLINE get_stored_allocator_const_return_t get_stored_allocator() const BOOST_NOEXCEPT_OR_NOTHROW { impl_get_stored_allocator_const_return_t r = m_flat_tree.get_stored_allocator(); - return container_detail::force(r); + return dtl::force(r); } ////////////////////////////////////////////// @@ -529,7 +529,7 @@ class flat_map //! //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE iterator begin() BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.begin()); } + { return dtl::force_copy(m_flat_tree.begin()); } //! Effects: Returns a const_iterator to the first element contained in the container. //! @@ -537,7 +537,7 @@ class flat_map //! //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE const_iterator begin() const BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.begin()); } + { return dtl::force_copy(m_flat_tree.begin()); } //! Effects: Returns an iterator to the end of the container. //! @@ -545,7 +545,7 @@ class flat_map //! //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE iterator end() BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.end()); } + { return dtl::force_copy(m_flat_tree.end()); } //! Effects: Returns a const_iterator to the end of the container. //! @@ -553,7 +553,7 @@ class flat_map //! //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE const_iterator end() const BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.end()); } + { return dtl::force_copy(m_flat_tree.end()); } //! Effects: Returns a reverse_iterator pointing to the beginning //! of the reversed container. @@ -562,7 +562,7 @@ class flat_map //! //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE reverse_iterator rbegin() BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.rbegin()); } + { return dtl::force_copy(m_flat_tree.rbegin()); } //! Effects: Returns a const_reverse_iterator pointing to the beginning //! of the reversed container. @@ -571,7 +571,7 @@ class flat_map //! //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE const_reverse_iterator rbegin() const BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.rbegin()); } + { return dtl::force_copy(m_flat_tree.rbegin()); } //! Effects: Returns a reverse_iterator pointing to the end //! of the reversed container. @@ -580,7 +580,7 @@ class flat_map //! //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE reverse_iterator rend() BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.rend()); } + { return dtl::force_copy(m_flat_tree.rend()); } //! Effects: Returns a const_reverse_iterator pointing to the end //! of the reversed container. @@ -589,7 +589,7 @@ class flat_map //! //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE const_reverse_iterator rend() const BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.rend()); } + { return dtl::force_copy(m_flat_tree.rend()); } //! Effects: Returns a const_iterator to the first element contained in the container. //! @@ -597,7 +597,7 @@ class flat_map //! //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE const_iterator cbegin() const BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.cbegin()); } + { return dtl::force_copy(m_flat_tree.cbegin()); } //! Effects: Returns a const_iterator to the end of the container. //! @@ -605,7 +605,7 @@ class flat_map //! //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE const_iterator cend() const BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.cend()); } + { return dtl::force_copy(m_flat_tree.cend()); } //! Effects: Returns a const_reverse_iterator pointing to the beginning //! of the reversed container. @@ -614,7 +614,7 @@ class flat_map //! //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE const_reverse_iterator crbegin() const BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.crbegin()); } + { return dtl::force_copy(m_flat_tree.crbegin()); } //! Effects: Returns a const_reverse_iterator pointing to the end //! of the reversed container. @@ -623,7 +623,7 @@ class flat_map //! //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE const_reverse_iterator crend() const BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.crend()); } + { return dtl::force_copy(m_flat_tree.crend()); } ////////////////////////////////////////////// // @@ -731,7 +731,7 @@ class flat_map template BOOST_CONTAINER_FORCEINLINE std::pair insert_or_assign(const key_type& k, BOOST_FWD_REF(M) obj) { - return container_detail::force_copy< std::pair > + return dtl::force_copy< std::pair > (this->m_flat_tree.insert_or_assign ( impl_const_iterator(), k, ::boost::forward(obj)) ); @@ -752,7 +752,7 @@ class flat_map template BOOST_CONTAINER_FORCEINLINE std::pair insert_or_assign(BOOST_RV_REF(key_type) k, BOOST_FWD_REF(M) obj) { - return container_detail::force_copy< std::pair > + return dtl::force_copy< std::pair > (this->m_flat_tree.insert_or_assign ( impl_const_iterator(), ::boost::move(k), ::boost::forward(obj)) ); @@ -775,9 +775,9 @@ class flat_map template BOOST_CONTAINER_FORCEINLINE iterator insert_or_assign(const_iterator hint, const key_type& k, BOOST_FWD_REF(M) obj) { - return container_detail::force_copy< std::pair > + return dtl::force_copy< std::pair > (this->m_flat_tree.insert_or_assign - ( container_detail::force_copy(hint) + ( dtl::force_copy(hint) , k, ::boost::forward(obj)) ); } @@ -799,28 +799,28 @@ class flat_map template BOOST_CONTAINER_FORCEINLINE iterator insert_or_assign(const_iterator hint, BOOST_RV_REF(key_type) k, BOOST_FWD_REF(M) obj) { - return container_detail::force_copy< std::pair > + return dtl::force_copy< std::pair > (this->m_flat_tree.insert_or_assign - ( container_detail::force_copy(hint) + ( dtl::force_copy(hint) , ::boost::move(k), ::boost::forward(obj)) ); } //! @copydoc ::boost::container::flat_set::nth(size_type) BOOST_CONTAINER_FORCEINLINE iterator nth(size_type n) BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.nth(n)); } + { return dtl::force_copy(m_flat_tree.nth(n)); } //! @copydoc ::boost::container::flat_set::nth(size_type) const BOOST_CONTAINER_FORCEINLINE const_iterator nth(size_type n) const BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.nth(n)); } + { return dtl::force_copy(m_flat_tree.nth(n)); } //! @copydoc ::boost::container::flat_set::index_of(iterator) BOOST_CONTAINER_FORCEINLINE size_type index_of(iterator p) BOOST_NOEXCEPT_OR_NOTHROW - { return m_flat_tree.index_of(container_detail::force_copy(p)); } + { return m_flat_tree.index_of(dtl::force_copy(p)); } //! @copydoc ::boost::container::flat_set::index_of(const_iterator) const BOOST_CONTAINER_FORCEINLINE size_type index_of(const_iterator p) const BOOST_NOEXCEPT_OR_NOTHROW - { return m_flat_tree.index_of(container_detail::force_copy(p)); } + { return m_flat_tree.index_of(dtl::force_copy(p)); } //! Returns: A reference to the element whose key is equivalent to x. //! @@ -872,7 +872,7 @@ class flat_map //! Note: If an element is inserted it might invalidate elements. template BOOST_CONTAINER_FORCEINLINE std::pair emplace(BOOST_FWD_REF(Args)... args) - { return container_detail::force_copy< std::pair >(m_flat_tree.emplace_unique(boost::forward(args)...)); } + { return dtl::force_copy< std::pair >(m_flat_tree.emplace_unique(boost::forward(args)...)); } //! Effects: Inserts an object of type T constructed with //! std::forward(args)... in the container if and only if there is @@ -889,8 +889,8 @@ class flat_map template BOOST_CONTAINER_FORCEINLINE iterator emplace_hint(const_iterator hint, BOOST_FWD_REF(Args)... args) { - return container_detail::force_copy - (m_flat_tree.emplace_hint_unique( container_detail::force_copy(hint) + return dtl::force_copy + (m_flat_tree.emplace_hint_unique( dtl::force_copy(hint) , boost::forward(args)...)); } @@ -908,7 +908,7 @@ class flat_map template BOOST_CONTAINER_FORCEINLINE std::pair try_emplace(const key_type& k, BOOST_FWD_REF(Args)... args) { - return container_detail::force_copy< std::pair >( + return dtl::force_copy< std::pair >( m_flat_tree.try_emplace(impl_const_iterator(), k, boost::forward(args)...)); } @@ -926,8 +926,8 @@ class flat_map template BOOST_CONTAINER_FORCEINLINE iterator try_emplace(const_iterator hint, const key_type &k, BOOST_FWD_REF(Args)... args) { - return container_detail::force_copy(m_flat_tree.try_emplace - (container_detail::force_copy(hint), k, boost::forward(args)...).first); + return dtl::force_copy(m_flat_tree.try_emplace + (dtl::force_copy(hint), k, boost::forward(args)...).first); } //! Requires: value_type shall be EmplaceConstructible into map from piecewise_construct, @@ -944,7 +944,7 @@ class flat_map template BOOST_CONTAINER_FORCEINLINE std::pair try_emplace(BOOST_RV_REF(key_type) k, BOOST_FWD_REF(Args)... args) { - return container_detail::force_copy< std::pair > + return dtl::force_copy< std::pair > (m_flat_tree.try_emplace(impl_const_iterator(), boost::move(k), boost::forward(args)...)); } @@ -962,8 +962,8 @@ class flat_map template BOOST_CONTAINER_FORCEINLINE iterator try_emplace(const_iterator hint, BOOST_RV_REF(key_type) k, BOOST_FWD_REF(Args)... args) { - return container_detail::force_copy - (m_flat_tree.try_emplace(container_detail::force_copy + return dtl::force_copy + (m_flat_tree.try_emplace(dtl::force_copy (hint), boost::move(k), boost::forward(args)...).first); } @@ -973,39 +973,39 @@ class flat_map BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \ BOOST_CONTAINER_FORCEINLINE std::pair emplace(BOOST_MOVE_UREF##N)\ {\ - return container_detail::force_copy< std::pair >\ + return dtl::force_copy< std::pair >\ (m_flat_tree.emplace_unique(BOOST_MOVE_FWD##N));\ }\ \ BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \ BOOST_CONTAINER_FORCEINLINE iterator emplace_hint(const_iterator hint BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\ {\ - return container_detail::force_copy(m_flat_tree.emplace_hint_unique\ - (container_detail::force_copy(hint) BOOST_MOVE_I##N BOOST_MOVE_FWD##N));\ + return dtl::force_copy(m_flat_tree.emplace_hint_unique\ + (dtl::force_copy(hint) BOOST_MOVE_I##N BOOST_MOVE_FWD##N));\ }\ BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \ BOOST_CONTAINER_FORCEINLINE std::pair try_emplace(const key_type& k BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\ {\ - return container_detail::force_copy< std::pair >\ + return dtl::force_copy< std::pair >\ (m_flat_tree.try_emplace(impl_const_iterator(), k BOOST_MOVE_I##N BOOST_MOVE_FWD##N));\ }\ \ BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \ BOOST_CONTAINER_FORCEINLINE iterator try_emplace(const_iterator hint, const key_type &k BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\ - { return container_detail::force_copy(m_flat_tree.try_emplace\ - (container_detail::force_copy(hint), k BOOST_MOVE_I##N BOOST_MOVE_FWD##N).first); }\ + { return dtl::force_copy(m_flat_tree.try_emplace\ + (dtl::force_copy(hint), k BOOST_MOVE_I##N BOOST_MOVE_FWD##N).first); }\ \ BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \ BOOST_CONTAINER_FORCEINLINE std::pair try_emplace(BOOST_RV_REF(key_type) k BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\ {\ - return container_detail::force_copy< std::pair >\ + return dtl::force_copy< std::pair >\ (m_flat_tree.try_emplace(impl_const_iterator(), boost::move(k) BOOST_MOVE_I##N BOOST_MOVE_FWD##N));\ }\ \ BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \ BOOST_CONTAINER_FORCEINLINE iterator try_emplace(const_iterator hint, BOOST_RV_REF(key_type) k BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\ - { return container_detail::force_copy(m_flat_tree.try_emplace\ - (container_detail::force_copy(hint), boost::move(k) BOOST_MOVE_I##N BOOST_MOVE_FWD##N).first); }\ + { return dtl::force_copy(m_flat_tree.try_emplace\ + (dtl::force_copy(hint), boost::move(k) BOOST_MOVE_I##N BOOST_MOVE_FWD##N).first); }\ // BOOST_MOVE_ITERATE_0TO9(BOOST_CONTAINER_FLAT_MAP_EMPLACE_CODE) #undef BOOST_CONTAINER_FLAT_MAP_EMPLACE_CODE @@ -1024,8 +1024,8 @@ class flat_map //! //! Note: If an element is inserted it might invalidate elements. BOOST_CONTAINER_FORCEINLINE std::pair insert(const value_type& x) - { return container_detail::force_copy >( - m_flat_tree.insert_unique(container_detail::force(x))); } + { return dtl::force_copy >( + m_flat_tree.insert_unique(dtl::force(x))); } //! Effects: Inserts a new value_type move constructed from the pair if and //! only if there is no element in the container with key equivalent to the key of x. @@ -1039,8 +1039,8 @@ class flat_map //! //! Note: If an element is inserted it might invalidate elements. BOOST_CONTAINER_FORCEINLINE std::pair insert(BOOST_RV_REF(value_type) x) - { return container_detail::force_copy >( - m_flat_tree.insert_unique(boost::move(container_detail::force(x)))); } + { return dtl::force_copy >( + m_flat_tree.insert_unique(boost::move(dtl::force(x)))); } //! Effects: Inserts a new value_type move constructed from the pair if and //! only if there is no element in the container with key equivalent to the key of x. @@ -1055,7 +1055,7 @@ class flat_map //! Note: If an element is inserted it might invalidate elements. BOOST_CONTAINER_FORCEINLINE std::pair insert(BOOST_RV_REF(movable_value_type) x) { - return container_detail::force_copy > + return dtl::force_copy > (m_flat_tree.insert_unique(boost::move(x))); } @@ -1072,9 +1072,9 @@ class flat_map //! Note: If an element is inserted it might invalidate elements. BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator p, const value_type& x) { - return container_detail::force_copy( - m_flat_tree.insert_unique( container_detail::force_copy(p) - , container_detail::force(x))); + return dtl::force_copy( + m_flat_tree.insert_unique( dtl::force_copy(p) + , dtl::force(x))); } //! Effects: Inserts an element move constructed from x in the container. @@ -1088,9 +1088,9 @@ class flat_map //! Note: If an element is inserted it might invalidate elements. BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator p, BOOST_RV_REF(value_type) x) { - return container_detail::force_copy - (m_flat_tree.insert_unique( container_detail::force_copy(p) - , boost::move(container_detail::force(x)))); + return dtl::force_copy + (m_flat_tree.insert_unique( dtl::force_copy(p) + , boost::move(dtl::force(x)))); } //! Effects: Inserts an element move constructed from x in the container. @@ -1104,8 +1104,8 @@ class flat_map //! Note: If an element is inserted it might invalidate elements. BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator p, BOOST_RV_REF(movable_value_type) x) { - return container_detail::force_copy( - m_flat_tree.insert_unique(container_detail::force_copy(p), boost::move(x))); + return dtl::force_copy( + m_flat_tree.insert_unique(dtl::force_copy(p), boost::move(x))); } //! Requires: first, last are not iterators into *this. @@ -1150,8 +1150,8 @@ class flat_map //! Note: If an element is inserted it might invalidate elements. BOOST_CONTAINER_FORCEINLINE void insert(std::initializer_list il) { - m_flat_tree.insert_unique( container_detail::force(il).begin() - , container_detail::force(il).end()); + m_flat_tree.insert_unique( dtl::force(il).begin() + , dtl::force(il).end()); } //! Requires: [il.begin(), il.end()) must be ordered according to the predicate and must be @@ -1170,8 +1170,8 @@ class flat_map BOOST_CONTAINER_FORCEINLINE void insert(ordered_unique_range_t, std::initializer_list il) { m_flat_tree.insert_unique(ordered_unique_range - , container_detail::force(il).begin() - , container_detail::force(il).end()); + , dtl::force(il).begin() + , dtl::force(il).end()); } #endif @@ -1220,8 +1220,8 @@ class flat_map //! not less than the erased element. BOOST_CONTAINER_FORCEINLINE iterator erase(const_iterator p) { - return container_detail::force_copy - (m_flat_tree.erase(container_detail::force_copy(p))); + return dtl::force_copy + (m_flat_tree.erase(dtl::force_copy(p))); } //! Effects: Erases all elements in the container with key equivalent to x. @@ -1243,9 +1243,9 @@ class flat_map //! linear to the elements with bigger keys. BOOST_CONTAINER_FORCEINLINE iterator erase(const_iterator first, const_iterator last) { - return container_detail::force_copy( - m_flat_tree.erase( container_detail::force_copy(first) - , container_detail::force_copy(last))); + return dtl::force_copy( + m_flat_tree.erase( dtl::force_copy(first) + , dtl::force_copy(last))); } //! Effects: Swaps the contents of *this and x. @@ -1255,7 +1255,7 @@ class flat_map //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE void swap(flat_map& x) BOOST_NOEXCEPT_IF( allocator_traits_type::is_always_equal::value - && boost::container::container_detail::is_nothrow_swappable::value ) + && boost::container::dtl::is_nothrow_swappable::value ) { m_flat_tree.swap(x.m_flat_tree); } //! Effects: erase(a.begin(),a.end()). @@ -1277,14 +1277,14 @@ class flat_map //! //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE key_compare key_comp() const - { return container_detail::force_copy(m_flat_tree.key_comp()); } + { return dtl::force_copy(m_flat_tree.key_comp()); } //! Effects: Returns an object of value_compare constructed out //! of the comparison object. //! //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE value_compare value_comp() const - { return value_compare(container_detail::force_copy(m_flat_tree.key_comp())); } + { return value_compare(dtl::force_copy(m_flat_tree.key_comp())); } ////////////////////////////////////////////// // @@ -1297,14 +1297,14 @@ class flat_map //! //! Complexity: Logarithmic. BOOST_CONTAINER_FORCEINLINE iterator find(const key_type& x) - { return container_detail::force_copy(m_flat_tree.find(x)); } + { return dtl::force_copy(m_flat_tree.find(x)); } //! Returns: A const_iterator pointing to an element with the key //! equivalent to x, or end() if such an element is not found. //! //! Complexity: Logarithmic. BOOST_CONTAINER_FORCEINLINE const_iterator find(const key_type& x) const - { return container_detail::force_copy(m_flat_tree.find(x)); } + { return dtl::force_copy(m_flat_tree.find(x)); } //! Returns: The number of elements with key equivalent to x. //! @@ -1317,40 +1317,40 @@ class flat_map //! //! Complexity: Logarithmic. BOOST_CONTAINER_FORCEINLINE iterator lower_bound(const key_type& x) - { return container_detail::force_copy(m_flat_tree.lower_bound(x)); } + { return dtl::force_copy(m_flat_tree.lower_bound(x)); } //! Returns: A const iterator pointing to the first element with key not //! less than k, or a.end() if such an element is not found. //! //! Complexity: Logarithmic. BOOST_CONTAINER_FORCEINLINE const_iterator lower_bound(const key_type& x) const - { return container_detail::force_copy(m_flat_tree.lower_bound(x)); } + { return dtl::force_copy(m_flat_tree.lower_bound(x)); } //! Returns: An iterator pointing to the first element with key not less //! than x, or end() if such an element is not found. //! //! Complexity: Logarithmic. BOOST_CONTAINER_FORCEINLINE iterator upper_bound(const key_type& x) - { return container_detail::force_copy(m_flat_tree.upper_bound(x)); } + { return dtl::force_copy(m_flat_tree.upper_bound(x)); } //! Returns: A const iterator pointing to the first element with key not //! less than x, or end() if such an element is not found. //! //! Complexity: Logarithmic. BOOST_CONTAINER_FORCEINLINE const_iterator upper_bound(const key_type& x) const - { return container_detail::force_copy(m_flat_tree.upper_bound(x)); } + { return dtl::force_copy(m_flat_tree.upper_bound(x)); } //! Effects: Equivalent to std::make_pair(this->lower_bound(k), this->upper_bound(k)). //! //! Complexity: Logarithmic. BOOST_CONTAINER_FORCEINLINE std::pair equal_range(const key_type& x) - { return container_detail::force_copy >(m_flat_tree.lower_bound_range(x)); } + { return dtl::force_copy >(m_flat_tree.lower_bound_range(x)); } //! Effects: Equivalent to std::make_pair(this->lower_bound(k), this->upper_bound(k)). //! //! Complexity: Logarithmic. BOOST_CONTAINER_FORCEINLINE std::pair equal_range(const key_type& x) const - { return container_detail::force_copy >(m_flat_tree.lower_bound_range(x)); } + { return dtl::force_copy >(m_flat_tree.lower_bound_range(x)); } //! Effects: Extracts the internal sequence container. //! @@ -1361,7 +1361,7 @@ class flat_map //! Throws: If secuence_type's move constructor throws BOOST_CONTAINER_FORCEINLINE sequence_type extract_sequence() { - return boost::move(container_detail::force(m_flat_tree.get_sequence_ref())); + return boost::move(dtl::force(m_flat_tree.get_sequence_ref())); } //! Effects: Discards the internally hold sequence container and adopts the @@ -1371,7 +1371,7 @@ class flat_map //! //! Throws: If the comparison or the move constructor throws BOOST_CONTAINER_FORCEINLINE void adopt_sequence(BOOST_RV_REF(sequence_type) seq) - { this->m_flat_tree.adopt_sequence_unique(boost::move(container_detail::force(seq))); } + { this->m_flat_tree.adopt_sequence_unique(boost::move(dtl::force(seq))); } //! Requires: seq shall be ordered according to this->compare() //! and shall contain unique elements. @@ -1383,7 +1383,7 @@ class flat_map //! //! Throws: If the move assignment throws BOOST_CONTAINER_FORCEINLINE void adopt_sequence(ordered_unique_range_t, BOOST_RV_REF(sequence_type) seq) - { this->m_flat_tree.adopt_sequence_unique(ordered_unique_range_t(), boost::move(container_detail::force(seq))); } + { this->m_flat_tree.adopt_sequence_unique(ordered_unique_range_t(), boost::move(dtl::force(seq))); } //! Effects: Returns true if x and y are equal //! @@ -1434,7 +1434,7 @@ class flat_map iterator i = lower_bound(k); // i->first is greater than or equivalent to k. if (i == end() || key_comp()(k, (*i).first)){ - container_detail::value_init m; + dtl::value_init m; i = insert(i, impl_value_type(k, ::boost::move(m.m_t))); } return (*i).second; @@ -1445,7 +1445,7 @@ class flat_map iterator i = lower_bound(k); // i->first is greater than or equivalent to k. if (i == end() || key_comp()(k, (*i).first)){ - container_detail::value_init m; + dtl::value_init m; i = insert(i, impl_value_type(boost::move(k), ::boost::move(m.m_t))); } return (*i).second; @@ -1510,17 +1510,17 @@ class flat_multimap #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED private: BOOST_COPYABLE_AND_MOVABLE(flat_multimap) - typedef container_detail::flat_tree< + typedef dtl::flat_tree< std::pair, - container_detail::select1st, + dtl::select1st, Compare, AllocatorOrContainer> tree_t; //This is the real tree stored here. It's based on a movable pair - typedef container_detail::flat_tree< - container_detail::pair, - container_detail::select1st, + typedef dtl::flat_tree< + dtl::pair, + dtl::select1st, Compare, - typename container_detail::container_or_allocator_rebind >::type + typename dtl::container_or_allocator_rebind >::type > impl_tree_t; impl_tree_t m_flat_tree; // flat tree representing flat_map @@ -1532,9 +1532,9 @@ class flat_multimap typedef std::initializer_list impl_initializer_list; #endif - typedef container_detail::flat_tree_value_compare + typedef dtl::flat_tree_value_compare < Compare - , container_detail::select1st + , dtl::select1st , std::pair > value_compare_t; typedef typename tree_t::iterator iterator_t; typedef typename tree_t::const_iterator const_iterator_t; @@ -1584,7 +1584,7 @@ class flat_multimap typedef BOOST_CONTAINER_IMPDEF(impl_value_type) movable_value_type; //AllocatorOrContainer::value_type must be std::pair - BOOST_STATIC_ASSERT((container_detail::is_same, typename AllocatorOrContainer::value_type>::value)); + BOOST_STATIC_ASSERT((dtl::is_same, typename AllocatorOrContainer::value_type>::value)); ////////////////////////////////////////////// // @@ -1596,8 +1596,8 @@ class flat_multimap //! //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE flat_multimap() - BOOST_NOEXCEPT_IF(container_detail::is_nothrow_default_constructible::value && - container_detail::is_nothrow_default_constructible::value) + BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible::value && + dtl::is_nothrow_default_constructible::value) : m_flat_tree() {} @@ -1605,7 +1605,7 @@ class flat_multimap //! //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE explicit flat_multimap(const allocator_type& a) - : m_flat_tree(container_detail::force(a)) + : m_flat_tree(dtl::force(a)) {} //! Effects: Constructs an empty flat_multimap using the specified comparison @@ -1622,7 +1622,7 @@ class flat_multimap //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE flat_multimap(const Compare& comp, const allocator_type& a) - : m_flat_tree(comp, container_detail::force(a)) + : m_flat_tree(comp, dtl::force(a)) {} //! Effects: Constructs an empty flat_multimap @@ -1644,7 +1644,7 @@ class flat_multimap template BOOST_CONTAINER_FORCEINLINE flat_multimap(InputIterator first, InputIterator last, const allocator_type& a) - : m_flat_tree(false, first, last, container_detail::force(a)) + : m_flat_tree(false, first, last, dtl::force(a)) {} //! Effects: Constructs an empty flat_multimap using the specified comparison object @@ -1666,7 +1666,7 @@ class flat_multimap template BOOST_CONTAINER_FORCEINLINE flat_multimap(InputIterator first, InputIterator last, const Compare& comp, const allocator_type& a) - : m_flat_tree(false, first, last, comp, container_detail::force(a)) + : m_flat_tree(false, first, last, comp, dtl::force(a)) {} //! Effects: Constructs an empty flat_multimap @@ -1723,8 +1723,8 @@ class flat_multimap BOOST_CONTAINER_FORCEINLINE flat_multimap(std::initializer_list il) : m_flat_tree( false - , container_detail::force(il).begin() - , container_detail::force(il).end()) + , dtl::force(il).begin() + , dtl::force(il).end()) {} //! Effects: Constructs an empty flat_map using the specified @@ -1735,9 +1735,9 @@ class flat_multimap BOOST_CONTAINER_FORCEINLINE flat_multimap(std::initializer_list il, const allocator_type& a) : m_flat_tree(false - , container_detail::force(il).begin() - , container_detail::force(il).end() - , container_detail::force(a)) + , dtl::force(il).begin() + , dtl::force(il).end() + , dtl::force(a)) {} //! Effects: Constructs an empty flat_map using the specified comparison object and @@ -1748,8 +1748,8 @@ class flat_multimap BOOST_CONTAINER_FORCEINLINE flat_multimap(std::initializer_list il, const Compare& comp) : m_flat_tree(false - , container_detail::force(il).begin() - , container_detail::force(il).end(), comp) + , dtl::force(il).begin() + , dtl::force(il).end(), comp) {} //! Effects: Constructs an empty flat_map using the specified comparison object and @@ -1760,9 +1760,9 @@ class flat_multimap BOOST_CONTAINER_FORCEINLINE flat_multimap(std::initializer_list il, const Compare& comp, const allocator_type& a) : m_flat_tree( false - , container_detail::force(il).begin() - , container_detail::force(il).end() - , comp, container_detail::force(a)) + , dtl::force(il).begin() + , dtl::force(il).end() + , comp, dtl::force(a)) {} //! Effects: Constructs an empty flat_multimap and @@ -1777,8 +1777,8 @@ class flat_multimap BOOST_CONTAINER_FORCEINLINE flat_multimap(ordered_range_t, std::initializer_list il) : m_flat_tree( ordered_range - , container_detail::force(il).begin() - , container_detail::force(il).end()) + , dtl::force(il).begin() + , dtl::force(il).end()) {} //! Effects: Constructs an empty flat_multimap using the specified comparison object and @@ -1793,8 +1793,8 @@ class flat_multimap BOOST_CONTAINER_FORCEINLINE flat_multimap(ordered_range_t, std::initializer_list il, const Compare& comp) : m_flat_tree( ordered_range - , container_detail::force(il).begin() - , container_detail::force(il).end(), comp) + , dtl::force(il).begin() + , dtl::force(il).end(), comp) {} //! Effects: Constructs an empty flat_multimap using the specified comparison object and @@ -1809,9 +1809,9 @@ class flat_multimap BOOST_CONTAINER_FORCEINLINE flat_multimap(ordered_range_t, std::initializer_list il, const Compare& comp, const allocator_type& a) : m_flat_tree( ordered_range - , container_detail::force(il).begin() - , container_detail::force(il).end() - , comp, container_detail::force(a)) + , dtl::force(il).begin() + , dtl::force(il).end() + , comp, dtl::force(a)) {} #endif @@ -1830,7 +1830,7 @@ class flat_multimap //! Postcondition: x is emptied. BOOST_CONTAINER_FORCEINLINE flat_multimap(BOOST_RV_REF(flat_multimap) x) - BOOST_NOEXCEPT_IF(boost::container::container_detail::is_nothrow_move_constructible::value) + BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_constructible::value) : m_flat_tree(boost::move(x.m_flat_tree)) {} @@ -1839,7 +1839,7 @@ class flat_multimap //! Complexity: Linear in x.size(). BOOST_CONTAINER_FORCEINLINE flat_multimap(const flat_multimap& x, const allocator_type &a) - : m_flat_tree(x.m_flat_tree, container_detail::force(a)) + : m_flat_tree(x.m_flat_tree, dtl::force(a)) {} //! Effects: Move constructs a flat_multimap using the specified allocator. @@ -1848,7 +1848,7 @@ class flat_multimap //! Complexity: Constant if a == x.get_allocator(), linear otherwise. BOOST_CONTAINER_FORCEINLINE flat_multimap(BOOST_RV_REF(flat_multimap) x, const allocator_type &a) - : m_flat_tree(boost::move(x.m_flat_tree), container_detail::force(a)) + : m_flat_tree(boost::move(x.m_flat_tree), dtl::force(a)) {} //! Effects: Makes *this a copy of x. @@ -1865,7 +1865,7 @@ class flat_multimap flat_multimap& operator=(BOOST_RV_REF(flat_multimap) x) BOOST_NOEXCEPT_IF( (allocator_traits_type::propagate_on_container_move_assignment::value || allocator_traits_type::is_always_equal::value) && - boost::container::container_detail::is_nothrow_move_assignable::value) + boost::container::dtl::is_nothrow_move_assignable::value) { m_flat_tree = boost::move(x.m_flat_tree); return *this; } #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST) @@ -1887,7 +1887,7 @@ class flat_multimap //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE allocator_type get_allocator() const BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.get_allocator()); } + { return dtl::force_copy(m_flat_tree.get_allocator()); } //! Effects: Returns a reference to the internal allocator. //! @@ -1898,7 +1898,7 @@ class flat_multimap //! Note: Non-standard extension. BOOST_CONTAINER_FORCEINLINE stored_allocator_type &get_stored_allocator() BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force(m_flat_tree.get_stored_allocator()); } + { return dtl::force(m_flat_tree.get_stored_allocator()); } //! Effects: Returns a reference to the internal allocator. //! @@ -1909,7 +1909,7 @@ class flat_multimap //! Note: Non-standard extension. BOOST_CONTAINER_FORCEINLINE const stored_allocator_type &get_stored_allocator() const BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force(m_flat_tree.get_stored_allocator()); } + { return dtl::force(m_flat_tree.get_stored_allocator()); } ////////////////////////////////////////////// // @@ -1924,7 +1924,7 @@ class flat_multimap //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE iterator begin() BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.begin()); } + { return dtl::force_copy(m_flat_tree.begin()); } //! Effects: Returns a const_iterator to the first element contained in the container. //! @@ -1933,7 +1933,7 @@ class flat_multimap //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE const_iterator begin() const BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.begin()); } + { return dtl::force_copy(m_flat_tree.begin()); } //! Effects: Returns an iterator to the end of the container. //! @@ -1942,7 +1942,7 @@ class flat_multimap //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE iterator end() BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.end()); } + { return dtl::force_copy(m_flat_tree.end()); } //! Effects: Returns a const_iterator to the end of the container. //! @@ -1951,7 +1951,7 @@ class flat_multimap //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE const_iterator end() const BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.end()); } + { return dtl::force_copy(m_flat_tree.end()); } //! Effects: Returns a reverse_iterator pointing to the beginning //! of the reversed container. @@ -1961,7 +1961,7 @@ class flat_multimap //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE reverse_iterator rbegin() BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.rbegin()); } + { return dtl::force_copy(m_flat_tree.rbegin()); } //! Effects: Returns a const_reverse_iterator pointing to the beginning //! of the reversed container. @@ -1971,7 +1971,7 @@ class flat_multimap //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE const_reverse_iterator rbegin() const BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.rbegin()); } + { return dtl::force_copy(m_flat_tree.rbegin()); } //! Effects: Returns a reverse_iterator pointing to the end //! of the reversed container. @@ -1981,7 +1981,7 @@ class flat_multimap //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE reverse_iterator rend() BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.rend()); } + { return dtl::force_copy(m_flat_tree.rend()); } //! Effects: Returns a const_reverse_iterator pointing to the end //! of the reversed container. @@ -1991,7 +1991,7 @@ class flat_multimap //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE const_reverse_iterator rend() const BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.rend()); } + { return dtl::force_copy(m_flat_tree.rend()); } //! Effects: Returns a const_iterator to the first element contained in the container. //! @@ -2000,7 +2000,7 @@ class flat_multimap //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE const_iterator cbegin() const BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.cbegin()); } + { return dtl::force_copy(m_flat_tree.cbegin()); } //! Effects: Returns a const_iterator to the end of the container. //! @@ -2009,7 +2009,7 @@ class flat_multimap //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE const_iterator cend() const BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.cend()); } + { return dtl::force_copy(m_flat_tree.cend()); } //! Effects: Returns a const_reverse_iterator pointing to the beginning //! of the reversed container. @@ -2019,7 +2019,7 @@ class flat_multimap //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE const_reverse_iterator crbegin() const BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.crbegin()); } + { return dtl::force_copy(m_flat_tree.crbegin()); } //! Effects: Returns a const_reverse_iterator pointing to the end //! of the reversed container. @@ -2029,7 +2029,7 @@ class flat_multimap //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE const_reverse_iterator crend() const BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.crend()); } + { return dtl::force_copy(m_flat_tree.crend()); } ////////////////////////////////////////////// // @@ -2101,22 +2101,22 @@ class flat_multimap //! @copydoc ::boost::container::flat_set::nth(size_type) BOOST_CONTAINER_FORCEINLINE iterator nth(size_type n) BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.nth(n)); } + { return dtl::force_copy(m_flat_tree.nth(n)); } //! @copydoc ::boost::container::flat_set::nth(size_type) const BOOST_CONTAINER_FORCEINLINE const_iterator nth(size_type n) const BOOST_NOEXCEPT_OR_NOTHROW - { return container_detail::force_copy(m_flat_tree.nth(n)); } + { return dtl::force_copy(m_flat_tree.nth(n)); } //! @copydoc ::boost::container::flat_set::index_of(iterator) BOOST_CONTAINER_FORCEINLINE size_type index_of(iterator p) BOOST_NOEXCEPT_OR_NOTHROW - { return m_flat_tree.index_of(container_detail::force_copy(p)); } + { return m_flat_tree.index_of(dtl::force_copy(p)); } //! @copydoc ::boost::container::flat_set::index_of(const_iterator) const BOOST_CONTAINER_FORCEINLINE size_type index_of(const_iterator p) const BOOST_NOEXCEPT_OR_NOTHROW - { return m_flat_tree.index_of(container_detail::force_copy(p)); } + { return m_flat_tree.index_of(dtl::force_copy(p)); } #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED) @@ -2131,7 +2131,7 @@ class flat_multimap template BOOST_CONTAINER_FORCEINLINE iterator emplace(BOOST_FWD_REF(Args)... args) - { return container_detail::force_copy(m_flat_tree.emplace_equal(boost::forward(args)...)); } + { return dtl::force_copy(m_flat_tree.emplace_equal(boost::forward(args)...)); } //! Effects: Inserts an object of type T constructed with //! std::forward(args)... in the container. @@ -2149,8 +2149,8 @@ class flat_multimap BOOST_CONTAINER_FORCEINLINE iterator emplace_hint(const_iterator hint, BOOST_FWD_REF(Args)... args) { - return container_detail::force_copy(m_flat_tree.emplace_hint_equal - (container_detail::force_copy(hint), boost::forward(args)...)); + return dtl::force_copy(m_flat_tree.emplace_hint_equal + (dtl::force_copy(hint), boost::forward(args)...)); } #else // !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) @@ -2158,13 +2158,13 @@ class flat_multimap #define BOOST_CONTAINER_FLAT_MULTIMAP_EMPLACE_CODE(N) \ BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \ BOOST_CONTAINER_FORCEINLINE iterator emplace(BOOST_MOVE_UREF##N)\ - { return container_detail::force_copy(m_flat_tree.emplace_equal(BOOST_MOVE_FWD##N)); }\ + { return dtl::force_copy(m_flat_tree.emplace_equal(BOOST_MOVE_FWD##N)); }\ \ BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \ BOOST_CONTAINER_FORCEINLINE iterator emplace_hint(const_iterator hint BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\ {\ - return container_detail::force_copy(m_flat_tree.emplace_hint_equal\ - (container_detail::force_copy(hint) BOOST_MOVE_I##N BOOST_MOVE_FWD##N));\ + return dtl::force_copy(m_flat_tree.emplace_hint_equal\ + (dtl::force_copy(hint) BOOST_MOVE_I##N BOOST_MOVE_FWD##N));\ }\ // BOOST_MOVE_ITERATE_0TO9(BOOST_CONTAINER_FLAT_MULTIMAP_EMPLACE_CODE) @@ -2181,8 +2181,8 @@ class flat_multimap //! Note: If an element is inserted it might invalidate elements. BOOST_CONTAINER_FORCEINLINE iterator insert(const value_type& x) { - return container_detail::force_copy( - m_flat_tree.insert_equal(container_detail::force(x))); + return dtl::force_copy( + m_flat_tree.insert_equal(dtl::force(x))); } //! Effects: Inserts a new value move-constructed from x and returns @@ -2193,7 +2193,7 @@ class flat_multimap //! //! Note: If an element is inserted it might invalidate elements. BOOST_CONTAINER_FORCEINLINE iterator insert(BOOST_RV_REF(value_type) x) - { return container_detail::force_copy(m_flat_tree.insert_equal(boost::move(x))); } + { return dtl::force_copy(m_flat_tree.insert_equal(boost::move(x))); } //! Effects: Inserts a new value move-constructed from x and returns //! the iterator pointing to the newly inserted element. @@ -2203,7 +2203,7 @@ class flat_multimap //! //! Note: If an element is inserted it might invalidate elements. BOOST_CONTAINER_FORCEINLINE iterator insert(BOOST_RV_REF(impl_value_type) x) - { return container_detail::force_copy(m_flat_tree.insert_equal(boost::move(x))); } + { return dtl::force_copy(m_flat_tree.insert_equal(boost::move(x))); } //! Effects: Inserts a copy of x in the container. //! p is a hint pointing to where the insert should start to search. @@ -2218,9 +2218,9 @@ class flat_multimap //! Note: If an element is inserted it might invalidate elements. BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator p, const value_type& x) { - return container_detail::force_copy - (m_flat_tree.insert_equal( container_detail::force_copy(p) - , container_detail::force(x))); + return dtl::force_copy + (m_flat_tree.insert_equal( dtl::force_copy(p) + , dtl::force(x))); } //! Effects: Inserts a value move constructed from x in the container. @@ -2236,8 +2236,8 @@ class flat_multimap //! Note: If an element is inserted it might invalidate elements. BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator p, BOOST_RV_REF(value_type) x) { - return container_detail::force_copy - (m_flat_tree.insert_equal(container_detail::force_copy(p) + return dtl::force_copy + (m_flat_tree.insert_equal(dtl::force_copy(p) , boost::move(x))); } @@ -2254,8 +2254,8 @@ class flat_multimap //! Note: If an element is inserted it might invalidate elements. BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator p, BOOST_RV_REF(impl_value_type) x) { - return container_detail::force_copy( - m_flat_tree.insert_equal(container_detail::force_copy(p), boost::move(x))); + return dtl::force_copy( + m_flat_tree.insert_equal(dtl::force_copy(p), boost::move(x))); } //! Requires: first, last are not iterators into *this. @@ -2297,8 +2297,8 @@ class flat_multimap //! Note: If an element is inserted it might invalidate elements. BOOST_CONTAINER_FORCEINLINE void insert(std::initializer_list il) { - m_flat_tree.insert_equal( container_detail::force(il).begin() - , container_detail::force(il).end()); + m_flat_tree.insert_equal( dtl::force(il).begin() + , dtl::force(il).end()); } //! Requires: [il.begin(), il.end()) must be ordered according to the predicate. @@ -2316,8 +2316,8 @@ class flat_multimap BOOST_CONTAINER_FORCEINLINE void insert(ordered_range_t, std::initializer_list il) { m_flat_tree.insert_equal( ordered_range - , container_detail::force(il).begin() - , container_detail::force(il).end()); + , dtl::force(il).begin() + , dtl::force(il).end()); } #endif @@ -2365,8 +2365,8 @@ class flat_multimap //! not less than the erased element. BOOST_CONTAINER_FORCEINLINE iterator erase(const_iterator p) { - return container_detail::force_copy( - m_flat_tree.erase(container_detail::force_copy(p))); + return dtl::force_copy( + m_flat_tree.erase(dtl::force_copy(p))); } //! Effects: Erases all elements in the container with key equivalent to x. @@ -2388,9 +2388,9 @@ class flat_multimap //! linear to the elements with bigger keys. BOOST_CONTAINER_FORCEINLINE iterator erase(const_iterator first, const_iterator last) { - return container_detail::force_copy - (m_flat_tree.erase( container_detail::force_copy(first) - , container_detail::force_copy(last))); + return dtl::force_copy + (m_flat_tree.erase( dtl::force_copy(first) + , dtl::force_copy(last))); } //! Effects: Swaps the contents of *this and x. @@ -2400,7 +2400,7 @@ class flat_multimap //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE void swap(flat_multimap& x) BOOST_NOEXCEPT_IF( allocator_traits_type::is_always_equal::value - && boost::container::container_detail::is_nothrow_swappable::value ) + && boost::container::dtl::is_nothrow_swappable::value ) { m_flat_tree.swap(x.m_flat_tree); } //! Effects: erase(a.begin(),a.end()). @@ -2422,14 +2422,14 @@ class flat_multimap //! //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE key_compare key_comp() const - { return container_detail::force_copy(m_flat_tree.key_comp()); } + { return dtl::force_copy(m_flat_tree.key_comp()); } //! Effects: Returns an object of value_compare constructed out //! of the comparison object. //! //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE value_compare value_comp() const - { return value_compare(container_detail::force_copy(m_flat_tree.key_comp())); } + { return value_compare(dtl::force_copy(m_flat_tree.key_comp())); } ////////////////////////////////////////////// // @@ -2442,14 +2442,14 @@ class flat_multimap //! //! Complexity: Logarithmic. BOOST_CONTAINER_FORCEINLINE iterator find(const key_type& x) - { return container_detail::force_copy(m_flat_tree.find(x)); } + { return dtl::force_copy(m_flat_tree.find(x)); } //! Returns: An const_iterator pointing to an element with the key //! equivalent to x, or end() if such an element is not found. //! //! Complexity: Logarithmic. BOOST_CONTAINER_FORCEINLINE const_iterator find(const key_type& x) const - { return container_detail::force_copy(m_flat_tree.find(x)); } + { return dtl::force_copy(m_flat_tree.find(x)); } //! Returns: The number of elements with key equivalent to x. //! @@ -2462,40 +2462,40 @@ class flat_multimap //! //! Complexity: Logarithmic BOOST_CONTAINER_FORCEINLINE iterator lower_bound(const key_type& x) - { return container_detail::force_copy(m_flat_tree.lower_bound(x)); } + { return dtl::force_copy(m_flat_tree.lower_bound(x)); } //! Returns: A const iterator pointing to the first element with key //! not less than k, or a.end() if such an element is not found. //! //! Complexity: Logarithmic BOOST_CONTAINER_FORCEINLINE const_iterator lower_bound(const key_type& x) const - { return container_detail::force_copy(m_flat_tree.lower_bound(x)); } + { return dtl::force_copy(m_flat_tree.lower_bound(x)); } //! Returns: An iterator pointing to the first element with key not less //! than x, or end() if such an element is not found. //! //! Complexity: Logarithmic BOOST_CONTAINER_FORCEINLINE iterator upper_bound(const key_type& x) - {return container_detail::force_copy(m_flat_tree.upper_bound(x)); } + {return dtl::force_copy(m_flat_tree.upper_bound(x)); } //! Returns: A const iterator pointing to the first element with key //! not less than x, or end() if such an element is not found. //! //! Complexity: Logarithmic BOOST_CONTAINER_FORCEINLINE const_iterator upper_bound(const key_type& x) const - { return container_detail::force_copy(m_flat_tree.upper_bound(x)); } + { return dtl::force_copy(m_flat_tree.upper_bound(x)); } //! Effects: Equivalent to std::make_pair(this->lower_bound(k), this->upper_bound(k)). //! //! Complexity: Logarithmic BOOST_CONTAINER_FORCEINLINE std::pair equal_range(const key_type& x) - { return container_detail::force_copy >(m_flat_tree.equal_range(x)); } + { return dtl::force_copy >(m_flat_tree.equal_range(x)); } //! Effects: Equivalent to std::make_pair(this->lower_bound(k), this->upper_bound(k)). //! //! Complexity: Logarithmic BOOST_CONTAINER_FORCEINLINE std::pair equal_range(const key_type& x) const - { return container_detail::force_copy >(m_flat_tree.equal_range(x)); } + { return dtl::force_copy >(m_flat_tree.equal_range(x)); } //! Effects: Extracts the internal sequence container. //! @@ -2506,7 +2506,7 @@ class flat_multimap //! Throws: If secuence_type's move constructor throws BOOST_CONTAINER_FORCEINLINE sequence_type extract_sequence() { - return boost::move(container_detail::force(m_flat_tree.get_sequence_ref())); + return boost::move(dtl::force(m_flat_tree.get_sequence_ref())); } //! Effects: Discards the internally hold sequence container and adopts the @@ -2516,7 +2516,7 @@ class flat_multimap //! //! Throws: If the comparison or the move constructor throws BOOST_CONTAINER_FORCEINLINE void adopt_sequence(BOOST_RV_REF(sequence_type) seq) - { this->m_flat_tree.adopt_sequence_equal(boost::move(container_detail::force(seq))); } + { this->m_flat_tree.adopt_sequence_equal(boost::move(dtl::force(seq))); } //! Requires: seq shall be ordered according to this->compare(). //! @@ -2527,7 +2527,7 @@ class flat_multimap //! //! Throws: If the move assignment throws BOOST_CONTAINER_FORCEINLINE void adopt_sequence(ordered_range_t, BOOST_RV_REF(sequence_type) seq) - { this->m_flat_tree.adopt_sequence_equal(ordered_range_t(), boost::move(container_detail::force(seq))); } + { this->m_flat_tree.adopt_sequence_equal(ordered_range_t(), boost::move(dtl::force(seq))); } //! Effects: Returns true if x and y are equal //! diff --git a/include/boost/container/flat_set.hpp b/include/boost/container/flat_set.hpp index 567fec9..706f705 100644 --- a/include/boost/container/flat_set.hpp +++ b/include/boost/container/flat_set.hpp @@ -80,13 +80,13 @@ template #endif class flat_set ///@cond - : public container_detail::flat_tree, Compare, AllocatorOrContainer> + : public dtl::flat_tree, Compare, AllocatorOrContainer> ///@endcond { #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED private: BOOST_COPYABLE_AND_MOVABLE(flat_set) - typedef container_detail::flat_tree, Compare, AllocatorOrContainer> tree_t; + typedef dtl::flat_tree, Compare, AllocatorOrContainer> tree_t; public: tree_t &tree() @@ -134,8 +134,8 @@ class flat_set //! //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE - flat_set() BOOST_NOEXCEPT_IF(container_detail::is_nothrow_default_constructible::value && - container_detail::is_nothrow_default_constructible::value) + flat_set() BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible::value && + dtl::is_nothrow_default_constructible::value) : tree_t() {} @@ -350,7 +350,7 @@ class flat_set //! //! Postcondition: x is emptied. BOOST_CONTAINER_FORCEINLINE flat_set(BOOST_RV_REF(flat_set) x) - BOOST_NOEXCEPT_IF(boost::container::container_detail::is_nothrow_move_constructible::value) + BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_constructible::value) : tree_t(BOOST_MOVE_BASE(tree_t, x)) {} @@ -384,7 +384,7 @@ class flat_set BOOST_CONTAINER_FORCEINLINE flat_set& operator=(BOOST_RV_REF(flat_set) x) BOOST_NOEXCEPT_IF( (allocator_traits_type::propagate_on_container_move_assignment::value || allocator_traits_type::is_always_equal::value) && - boost::container::container_detail::is_nothrow_move_assignable::value) + boost::container::dtl::is_nothrow_move_assignable::value) { return static_cast(this->tree_t::operator=(BOOST_MOVE_BASE(tree_t, x))); } #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST) @@ -794,7 +794,7 @@ class flat_set //! Complexity: Constant. void swap(flat_set& x) BOOST_NOEXCEPT_IF( allocator_traits_type::is_always_equal::value - && boost::container::container_detail::is_nothrow_swappable::value ); + && boost::container::dtl::is_nothrow_swappable::value ); //! Effects: erase(a.begin(),a.end()). //! @@ -1052,13 +1052,13 @@ template #endif class flat_multiset ///@cond - : public container_detail::flat_tree, Compare, AllocatorOrContainer> + : public dtl::flat_tree, Compare, AllocatorOrContainer> ///@endcond { #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED private: BOOST_COPYABLE_AND_MOVABLE(flat_multiset) - typedef container_detail::flat_tree, Compare, AllocatorOrContainer> tree_t; + typedef dtl::flat_tree, Compare, AllocatorOrContainer> tree_t; public: tree_t &tree() @@ -1095,8 +1095,8 @@ class flat_multiset typedef typename sequence_type::const_reverse_iterator const_reverse_iterator; //! @copydoc ::boost::container::flat_set::flat_set() - BOOST_CONTAINER_FORCEINLINE flat_multiset() BOOST_NOEXCEPT_IF(container_detail::is_nothrow_default_constructible::value && - container_detail::is_nothrow_default_constructible::value) + BOOST_CONTAINER_FORCEINLINE flat_multiset() BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible::value && + dtl::is_nothrow_default_constructible::value) : tree_t() {} @@ -1249,7 +1249,7 @@ class flat_multiset //! @copydoc ::boost::container::flat_set::flat_set(flat_set &&) BOOST_CONTAINER_FORCEINLINE flat_multiset(BOOST_RV_REF(flat_multiset) x) - BOOST_NOEXCEPT_IF(boost::container::container_detail::is_nothrow_move_constructible::value) + BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_constructible::value) : tree_t(boost::move(static_cast(x))) {} @@ -1271,7 +1271,7 @@ class flat_multiset BOOST_CONTAINER_FORCEINLINE flat_multiset& operator=(BOOST_RV_REF(flat_multiset) x) BOOST_NOEXCEPT_IF( (allocator_traits_type::propagate_on_container_move_assignment::value || allocator_traits_type::is_always_equal::value) && - boost::container::container_detail::is_nothrow_move_assignable::value) + boost::container::dtl::is_nothrow_move_assignable::value) { return static_cast(this->tree_t::operator=(BOOST_MOVE_BASE(tree_t, x))); } #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST) @@ -1535,7 +1535,7 @@ class flat_multiset //! @copydoc ::boost::container::flat_set::swap void swap(flat_multiset& x) BOOST_NOEXCEPT_IF( allocator_traits_type::is_always_equal::value - && boost::container::container_detail::is_nothrow_swappable::value ); + && boost::container::dtl::is_nothrow_swappable::value ); //! @copydoc ::boost::container::flat_set::clear void clear() BOOST_NOEXCEPT_OR_NOTHROW; diff --git a/include/boost/container/list.hpp b/include/boost/container/list.hpp index f779cc4..bd039b7 100644 --- a/include/boost/container/list.hpp +++ b/include/boost/container/list.hpp @@ -57,13 +57,13 @@ namespace boost { namespace container { #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED -namespace container_detail { +namespace dtl { template struct list_hook { - typedef typename container_detail::bi::make_list_base_hook - , container_detail::bi::link_mode >::type type; + typedef typename dtl::bi::make_list_base_hook + , dtl::bi::link_mode >::type type; }; template @@ -100,19 +100,19 @@ struct intrusive_list_type ::template rebind_pointer::type void_pointer; - typedef typename container_detail::list_node + typedef typename dtl::list_node node_type; - typedef typename container_detail::bi::make_list + typedef typename dtl::bi::make_list < node_type - , container_detail::bi::base_hook::type> - , container_detail::bi::constant_time_size - , container_detail::bi::size_type + , dtl::bi::base_hook::type> + , dtl::bi::constant_time_size + , dtl::bi::size_type >::type container_type; typedef container_type type ; }; -} //namespace container_detail { +} //namespace dtl { #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED //! A list is a doubly linked list. That is, it is a Sequence that supports both @@ -134,26 +134,26 @@ template > template #endif class list - : protected container_detail::node_alloc_holder - ::type> + : protected dtl::node_alloc_holder + ::type> { #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED typedef typename - container_detail::intrusive_list_type::type Icont; - typedef container_detail::node_alloc_holder AllocHolder; + dtl::intrusive_list_type::type Icont; + typedef dtl::node_alloc_holder AllocHolder; typedef typename AllocHolder::NodePtr NodePtr; typedef typename AllocHolder::NodeAlloc NodeAlloc; typedef typename AllocHolder::ValAlloc ValAlloc; typedef typename AllocHolder::Node Node; - typedef container_detail::allocator_destroyer Destroyer; + typedef dtl::allocator_destroyer Destroyer; typedef typename AllocHolder::alloc_version alloc_version; typedef boost::container::allocator_traits allocator_traits_type; typedef boost::container::equal_to_value equal_to_value_type; BOOST_COPYABLE_AND_MOVABLE(list) - typedef container_detail::iterator_from_iiterator iterator_impl; - typedef container_detail::iterator_from_iiterator const_iterator_impl; + typedef dtl::iterator_from_iiterator iterator_impl; + typedef dtl::iterator_from_iiterator const_iterator_impl; #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED public: @@ -188,7 +188,7 @@ class list //! Throws: If allocator_type's default constructor throws. //! //! Complexity: Constant. - list() BOOST_NOEXCEPT_IF(container_detail::is_nothrow_default_constructible::value) + list() BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible::value) : AllocHolder() {} @@ -331,7 +331,7 @@ class list if (&x != this){ NodeAlloc &this_alloc = this->node_alloc(); const NodeAlloc &x_alloc = x.node_alloc(); - container_detail::bool_ flag; if(flag && this_alloc != x_alloc){ this->clear(); @@ -417,7 +417,7 @@ class list template void assign(InpIt first, InpIt last #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) - , typename container_detail::disable_if_convertible::type * = 0 + , typename dtl::disable_if_convertible::type * = 0 #endif ) { @@ -866,10 +866,10 @@ class list template iterator insert(const_iterator p, InpIt first, InpIt last #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) - , typename container_detail::enable_if_c - < !container_detail::is_convertible::value - && (container_detail::is_input_iterator::value - || container_detail::is_same::value + , typename dtl::enable_if_c + < !dtl::is_convertible::value + && (dtl::is_input_iterator::value + || dtl::is_same::value ) >::type * = 0 #endif @@ -891,10 +891,10 @@ class list #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) template iterator insert(const_iterator position, FwdIt first, FwdIt last - , typename container_detail::enable_if_c - < !container_detail::is_convertible::value - && !(container_detail::is_input_iterator::value - || container_detail::is_same::value + , typename dtl::enable_if_c + < !dtl::is_convertible::value + && !(dtl::is_input_iterator::value + || dtl::is_same::value ) >::type * = 0 ) diff --git a/include/boost/container/map.hpp b/include/boost/container/map.hpp index 33e0331..63e10b4 100644 --- a/include/boost/container/map.hpp +++ b/include/boost/container/map.hpp @@ -78,9 +78,9 @@ template #endif class map ///@cond - : public container_detail::tree + : public dtl::tree < std::pair - , container_detail::select1st + , dtl::select1st , Compare, Allocator, Options> ///@endcond { @@ -88,11 +88,11 @@ class map private: BOOST_COPYABLE_AND_MOVABLE(map) - typedef container_detail::select1st select_1st_t; + typedef dtl::select1st select_1st_t; typedef std::pair value_type_impl; - typedef container_detail::tree + typedef dtl::tree base_t; - typedef container_detail::pair movable_value_type_impl; + typedef dtl::pair movable_value_type_impl; typedef typename base_t::value_compare value_compare_impl; #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED @@ -131,7 +131,7 @@ class map (insert_return_type_base) insert_return_type; //allocator_type::value_type type must be std::pair - BOOST_STATIC_ASSERT((container_detail::is_same >::value)); + BOOST_STATIC_ASSERT((dtl::is_same >::value)); ////////////////////////////////////////////// // @@ -143,8 +143,8 @@ class map //! //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE - map() BOOST_NOEXCEPT_IF(container_detail::is_nothrow_default_constructible::value && - container_detail::is_nothrow_default_constructible::value) + map() BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible::value && + dtl::is_nothrow_default_constructible::value) : base_t() {} @@ -350,7 +350,7 @@ class map //! //! Postcondition: x is emptied. BOOST_CONTAINER_FORCEINLINE map(BOOST_RV_REF(map) x) - BOOST_NOEXCEPT_IF(boost::container::container_detail::is_nothrow_move_constructible::value) + BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_constructible::value) : base_t(BOOST_MOVE_BASE(base_t, x)) {} @@ -388,7 +388,7 @@ class map BOOST_CONTAINER_FORCEINLINE map& operator=(BOOST_RV_REF(map) x) BOOST_NOEXCEPT_IF( (allocator_traits_type::propagate_on_container_move_assignment::value || allocator_traits_type::is_always_equal::value) && - boost::container::container_detail::is_nothrow_move_assignable::value) + boost::container::dtl::is_nothrow_move_assignable::value) { return static_cast(this->base_t::operator=(BOOST_MOVE_BASE(base_t, x))); } #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST) @@ -1014,7 +1014,7 @@ class map template BOOST_CONTAINER_FORCEINLINE void merge(map& source) { - typedef container_detail::tree + typedef dtl::tree base2_t; this->merge_unique(static_cast(source)); } @@ -1028,7 +1028,7 @@ class map template BOOST_CONTAINER_FORCEINLINE void merge(multimap& source) { - typedef container_detail::tree + typedef dtl::tree base2_t; this->base_t::merge_unique(static_cast(source)); } @@ -1046,7 +1046,7 @@ class map //! Complexity: Constant. void swap(map& x) BOOST_NOEXCEPT_IF( allocator_traits_type::is_always_equal::value - && boost::container::container_detail::is_nothrow_swappable::value ) + && boost::container::dtl::is_nothrow_swappable::value ) //! Effects: erase(a.begin(),a.end()). //! @@ -1219,9 +1219,9 @@ template #endif class multimap ///@cond - : public container_detail::tree + : public dtl::tree < std::pair - , container_detail::select1st + , dtl::select1st , Compare, Allocator, Options> ///@endcond { @@ -1229,11 +1229,11 @@ class multimap private: BOOST_COPYABLE_AND_MOVABLE(multimap) - typedef container_detail::select1st select_1st_t; + typedef dtl::select1st select_1st_t; typedef std::pair value_type_impl; - typedef container_detail::tree + typedef dtl::tree base_t; - typedef container_detail::pair movable_value_type_impl; + typedef dtl::pair movable_value_type_impl; typedef typename base_t::value_compare value_compare_impl; #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED @@ -1271,7 +1271,7 @@ class multimap >) node_type; //allocator_type::value_type type must be std::pair - BOOST_STATIC_ASSERT((container_detail::is_same >::value)); + BOOST_STATIC_ASSERT((dtl::is_same >::value)); ////////////////////////////////////////////// // @@ -1283,8 +1283,8 @@ class multimap //! //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE multimap() - BOOST_NOEXCEPT_IF(container_detail::is_nothrow_default_constructible::value && - container_detail::is_nothrow_default_constructible::value) + BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible::value && + dtl::is_nothrow_default_constructible::value) : base_t() {} @@ -1486,7 +1486,7 @@ class multimap //! //! Postcondition: x is emptied. BOOST_CONTAINER_FORCEINLINE multimap(BOOST_RV_REF(multimap) x) - BOOST_NOEXCEPT_IF(boost::container::container_detail::is_nothrow_move_constructible::value) + BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_constructible::value) : base_t(BOOST_MOVE_BASE(base_t, x)) {} @@ -1518,7 +1518,7 @@ class multimap BOOST_CONTAINER_FORCEINLINE multimap& operator=(BOOST_RV_REF(multimap) x) BOOST_NOEXCEPT_IF( (allocator_traits_type::propagate_on_container_move_assignment::value || allocator_traits_type::is_always_equal::value) && - boost::container::container_detail::is_nothrow_move_assignable::value) + boost::container::dtl::is_nothrow_move_assignable::value) { return static_cast(this->base_t::operator=(BOOST_MOVE_BASE(base_t, x))); } #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST) @@ -1790,7 +1790,7 @@ class multimap template BOOST_CONTAINER_FORCEINLINE void merge(multimap& source) { - typedef container_detail::tree + typedef dtl::tree base2_t; this->base_t::merge_equal(static_cast(source)); } @@ -1804,7 +1804,7 @@ class multimap template BOOST_CONTAINER_FORCEINLINE void merge(map& source) { - typedef container_detail::tree + typedef dtl::tree base2_t; this->base_t::merge_equal(static_cast(source)); } @@ -1818,7 +1818,7 @@ class multimap //! @copydoc ::boost::container::set::swap void swap(multiset& x) BOOST_NOEXCEPT_IF( allocator_traits_type::is_always_equal::value - && boost::container::container_detail::is_nothrow_swappable::value ); + && boost::container::dtl::is_nothrow_swappable::value ); //! @copydoc ::boost::container::set::clear void clear() BOOST_NOEXCEPT_OR_NOTHROW; diff --git a/include/boost/container/node_allocator.hpp b/include/boost/container/node_allocator.hpp index 7a6988c..b5c20a6 100644 --- a/include/boost/container/node_allocator.hpp +++ b/include/boost/container/node_allocator.hpp @@ -74,19 +74,19 @@ class node_allocator typedef T * pointer; typedef const T * const_pointer; typedef typename ::boost::container:: - container_detail::unvoid_ref::type reference; + dtl::unvoid_ref::type reference; typedef typename ::boost::container:: - container_detail::unvoid_ref::type const_reference; + dtl::unvoid_ref::type const_reference; typedef std::size_t size_type; typedef std::ptrdiff_t difference_type; - typedef boost::container::container_detail:: + typedef boost::container::dtl:: version_type version; #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED - typedef boost::container::container_detail:: + typedef boost::container::dtl:: basic_multiallocation_chain multiallocation_chain_void; - typedef boost::container::container_detail:: + typedef boost::container::dtl:: transform_multiallocation_chain multiallocation_chain; #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED @@ -148,9 +148,9 @@ class node_allocator boost::container::throw_bad_alloc(); if(Version == 1 && count == 1){ - typedef container_detail::shared_node_pool + typedef dtl::shared_node_pool shared_pool_t; - typedef container_detail::singleton_default singleton_t; + typedef dtl::singleton_default singleton_t; return pointer(static_cast(singleton_t::instance().allocate_node())); } else{ @@ -167,9 +167,9 @@ class node_allocator { (void)count; if(Version == 1 && count == 1){ - typedef container_detail::shared_node_pool + typedef dtl::shared_node_pool shared_pool_t; - typedef container_detail::singleton_default singleton_t; + typedef dtl::singleton_default singleton_t; singleton_t::instance().deallocate_node(ptr); } else{ @@ -180,9 +180,9 @@ class node_allocator //!Deallocates all free blocks of the pool static void deallocate_free_blocks() BOOST_NOEXCEPT_OR_NOTHROW { - typedef container_detail::shared_node_pool + typedef dtl::shared_node_pool shared_pool_t; - typedef container_detail::singleton_default singleton_t; + typedef dtl::singleton_default singleton_t; singleton_t::instance().deallocate_free_blocks(); } @@ -210,9 +210,9 @@ class node_allocator pointer allocate_one() { BOOST_STATIC_ASSERT(( Version > 1 )); - typedef container_detail::shared_node_pool + typedef dtl::shared_node_pool shared_pool_t; - typedef container_detail::singleton_default singleton_t; + typedef dtl::singleton_default singleton_t; return (pointer)singleton_t::instance().allocate_node(); } @@ -221,9 +221,9 @@ class node_allocator void allocate_individual(std::size_t num_elements, multiallocation_chain &chain) { BOOST_STATIC_ASSERT(( Version > 1 )); - typedef container_detail::shared_node_pool + typedef dtl::shared_node_pool shared_pool_t; - typedef container_detail::singleton_default singleton_t; + typedef dtl::singleton_default singleton_t; typename shared_pool_t::multiallocation_chain ch; singleton_t::instance().allocate_nodes(num_elements, ch); chain.incorporate_after(chain.before_begin(), (T*)&*ch.begin(), (T*)&*ch.last(), ch.size()); @@ -235,18 +235,18 @@ class node_allocator void deallocate_one(pointer p) BOOST_NOEXCEPT_OR_NOTHROW { BOOST_STATIC_ASSERT(( Version > 1 )); - typedef container_detail::shared_node_pool + typedef dtl::shared_node_pool shared_pool_t; - typedef container_detail::singleton_default singleton_t; + typedef dtl::singleton_default singleton_t; singleton_t::instance().deallocate_node(p); } void deallocate_individual(multiallocation_chain &chain) BOOST_NOEXCEPT_OR_NOTHROW { BOOST_STATIC_ASSERT(( Version > 1 )); - typedef container_detail::shared_node_pool + typedef dtl::shared_node_pool shared_pool_t; - typedef container_detail::singleton_default singleton_t; + typedef dtl::singleton_default singleton_t; typename shared_pool_t::multiallocation_chain ch(&*chain.begin(), &*chain.last(), chain.size()); singleton_t::instance().deallocate_nodes(ch); } diff --git a/include/boost/container/node_handle.hpp b/include/boost/container/node_handle.hpp index 594a09c..ef1d71f 100644 --- a/include/boost/container/node_handle.hpp +++ b/include/boost/container/node_handle.hpp @@ -174,9 +174,9 @@ class node_handle //! of a node handle is void. template node_handle( BOOST_RV_REF_BEG node_handle BOOST_RV_REF_END nh - , typename container_detail::enable_if_c - < ((unsigned)container_detail::is_same::value + - (unsigned)container_detail::is_same::value) == 1u + , typename dtl::enable_if_c + < ((unsigned)dtl::is_same::value + + (unsigned)dtl::is_same::value) == 1u >::type* = 0) BOOST_NOEXCEPT : m_ptr(nh.get()) { this->move_construct_end(nh); } @@ -250,7 +250,7 @@ class node_handle //! Throws: Nothing. value_type& value() const BOOST_NOEXCEPT { - BOOST_STATIC_ASSERT((container_detail::is_same::value)); + BOOST_STATIC_ASSERT((dtl::is_same::value)); BOOST_ASSERT(!empty()); return m_ptr->get_data(); } @@ -265,7 +265,7 @@ class node_handle //! Requires: Modifying the key through the returned reference is permitted. key_type& key() const BOOST_NOEXCEPT { - BOOST_STATIC_ASSERT((!container_detail::is_same::value)); + BOOST_STATIC_ASSERT((!dtl::is_same::value)); BOOST_ASSERT(!empty()); return const_cast(KeyMapped().key_of_value(m_ptr->get_data())); } @@ -278,7 +278,7 @@ class node_handle //! Throws: Nothing. mapped_type& mapped() const BOOST_NOEXCEPT { - BOOST_STATIC_ASSERT((!container_detail::is_same::value)); + BOOST_STATIC_ASSERT((!dtl::is_same::value)); BOOST_ASSERT(!empty()); return KeyMapped().mapped_of_value(m_ptr->get_data()); } diff --git a/include/boost/container/pmr/polymorphic_allocator.hpp b/include/boost/container/pmr/polymorphic_allocator.hpp index c446bc8..8c04653 100644 --- a/include/boost/container/pmr/polymorphic_allocator.hpp +++ b/include/boost/container/pmr/polymorphic_allocator.hpp @@ -104,7 +104,7 @@ class polymorphic_allocator void construct(U* p, BOOST_FWD_REF(Args)...args) { new_allocator na; - container_detail::dispatch_uses_allocator + dtl::dispatch_uses_allocator (na, *this, p, ::boost::forward(args)...); } @@ -117,7 +117,7 @@ class polymorphic_allocator void construct(U* p BOOST_MOVE_I##N BOOST_MOVE_UREFQ##N)\ {\ new_allocator na;\ - container_detail::dispatch_uses_allocator\ + dtl::dispatch_uses_allocator\ (na, *this, p BOOST_MOVE_I##N BOOST_MOVE_FWDQ##N);\ }\ // diff --git a/include/boost/container/pmr/resource_adaptor.hpp b/include/boost/container/pmr/resource_adaptor.hpp index deece63..f5ce5c8 100644 --- a/include/boost/container/pmr/resource_adaptor.hpp +++ b/include/boost/container/pmr/resource_adaptor.hpp @@ -57,7 +57,7 @@ class resource_adaptor_imp void static_assert_if_not_char_allocator() const { //This class can only be used with allocators type char - BOOST_STATIC_ASSERT((container_detail::is_same::value)); + BOOST_STATIC_ASSERT((dtl::is_same::value)); } #endif diff --git a/include/boost/container/scoped_allocator.hpp b/include/boost/container/scoped_allocator.hpp index 6a041a6..6cd69fe 100644 --- a/include/boost/container/scoped_allocator.hpp +++ b/include/boost/container/scoped_allocator.hpp @@ -44,7 +44,7 @@ namespace boost { namespace container { #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED -namespace container_detail { +namespace dtl { template struct is_scoped_allocator_imp @@ -99,16 +99,16 @@ struct outermost_allocator_imp { return outermost_allocator_imp::get(a.outer_allocator()); } }; -} //namespace container_detail { +} //namespace dtl { template struct is_scoped_allocator - : container_detail::is_scoped_allocator_imp + : dtl::is_scoped_allocator_imp {}; template struct outermost_allocator - : container_detail::outermost_allocator_imp + : dtl::outermost_allocator_imp {}; template @@ -121,7 +121,7 @@ const typename outermost_allocator::type & get_outermost_allocator(const Allocator &a) { return outermost_allocator::get(a); } -namespace container_detail { +namespace dtl { #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) @@ -144,19 +144,19 @@ class scoped_allocator_adaptor_base typedef allocator_traits inner_traits_type; typedef scoped_allocator_adaptor scoped_allocator_type; - typedef container_detail::bool_< + typedef dtl::bool_< outer_traits_type::propagate_on_container_copy_assignment::value || inner_allocator_type::propagate_on_container_copy_assignment::value > propagate_on_container_copy_assignment; - typedef container_detail::bool_< + typedef dtl::bool_< outer_traits_type::propagate_on_container_move_assignment::value || inner_allocator_type::propagate_on_container_move_assignment::value > propagate_on_container_move_assignment; - typedef container_detail::bool_< + typedef dtl::bool_< outer_traits_type::propagate_on_container_swap::value || inner_allocator_type::propagate_on_container_swap::value > propagate_on_container_swap; - typedef container_detail::bool_< + typedef dtl::bool_< outer_traits_type::is_always_equal::value && inner_allocator_type::is_always_equal::value > is_always_equal; @@ -286,20 +286,20 @@ class scoped_allocator_adaptor_base\ typedef scoped_allocator_adaptor inner_allocator_type;\ typedef scoped_allocator_adaptor scoped_allocator_type;\ typedef allocator_traits inner_traits_type;\ - typedef container_detail::bool_<\ + typedef dtl::bool_<\ outer_traits_type::propagate_on_container_copy_assignment::value ||\ inner_allocator_type::propagate_on_container_copy_assignment::value\ > propagate_on_container_copy_assignment;\ - typedef container_detail::bool_<\ + typedef dtl::bool_<\ outer_traits_type::propagate_on_container_move_assignment::value ||\ inner_allocator_type::propagate_on_container_move_assignment::value\ > propagate_on_container_move_assignment;\ - typedef container_detail::bool_<\ + typedef dtl::bool_<\ outer_traits_type::propagate_on_container_swap::value ||\ inner_allocator_type::propagate_on_container_swap::value\ > propagate_on_container_swap;\ \ - typedef container_detail::bool_<\ + typedef dtl::bool_<\ outer_traits_type::is_always_equal::value &&\ inner_allocator_type::is_always_equal::value\ > is_always_equal;\ @@ -521,7 +521,7 @@ class scoped_allocator_adaptor_base< OuterAlloc BOOST_CONTAINER_SCOPEDALLOC_DUMM } }; -} //namespace container_detail { +} //namespace dtl { #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED @@ -578,14 +578,14 @@ template class scoped_allocator_adaptor #endif - : public container_detail::scoped_allocator_adaptor_base + : public dtl::scoped_allocator_adaptor_base { BOOST_COPYABLE_AND_MOVABLE(scoped_allocator_adaptor) public: #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED - typedef container_detail::scoped_allocator_adaptor_base + typedef dtl::scoped_allocator_adaptor_base base_type; typedef typename base_type::internal_type_t internal_type_t; #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED @@ -810,7 +810,7 @@ class scoped_allocator_adaptor template < typename T, class ...Args> void construct(T* p, BOOST_FWD_REF(Args)...args) { - container_detail::dispatch_uses_allocator + dtl::dispatch_uses_allocator ( (get_outermost_allocator)(this->outer_allocator()) , this->inner_allocator(), p, ::boost::forward(args)...); } @@ -823,7 +823,7 @@ class scoped_allocator_adaptor template < typename T BOOST_MOVE_I##N BOOST_MOVE_CLASSQ##N >\ void construct(T* p BOOST_MOVE_I##N BOOST_MOVE_UREFQ##N)\ {\ - container_detail::dispatch_uses_allocator\ + dtl::dispatch_uses_allocator\ ( (get_outermost_allocator)(this->outer_allocator())\ , this->inner_allocator(), p BOOST_MOVE_I##N BOOST_MOVE_FWDQ##N);\ }\ @@ -888,7 +888,7 @@ inline bool operator==(const scoped_allocator_adaptor::value; + const bool has_zero_inner = boost::container::dtl::is_same::value; #endif typedef scoped_allocator_operator_equal equal_t; return equal_t::equal_outer(a.outer_allocator(), b.outer_allocator()) && diff --git a/include/boost/container/set.hpp b/include/boost/container/set.hpp index 8730b1c..1bff1a3 100644 --- a/include/boost/container/set.hpp +++ b/include/boost/container/set.hpp @@ -66,15 +66,15 @@ template #endif class set ///@cond - : public container_detail::tree - < Key, container_detail::identity, Compare, Allocator, Options> + : public dtl::tree + < Key, dtl::identity, Compare, Allocator, Options> ///@endcond { #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED private: BOOST_COPYABLE_AND_MOVABLE(set) - typedef container_detail::tree - < Key, container_detail::identity, Compare, Allocator, Options> base_t; + typedef dtl::tree + < Key, dtl::identity, Compare, Allocator, Options> base_t; #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED public: @@ -114,8 +114,8 @@ class set //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE set() - BOOST_NOEXCEPT_IF(container_detail::is_nothrow_default_constructible::value && - container_detail::is_nothrow_default_constructible::value) + BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible::value && + dtl::is_nothrow_default_constructible::value) : base_t() {} @@ -320,7 +320,7 @@ class set //! //! Postcondition: x is emptied. BOOST_CONTAINER_FORCEINLINE set(BOOST_RV_REF(set) x) - BOOST_NOEXCEPT_IF(boost::container::container_detail::is_nothrow_move_constructible::value) + BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_constructible::value) : base_t(BOOST_MOVE_BASE(base_t, x)) {} @@ -356,7 +356,7 @@ class set BOOST_CONTAINER_FORCEINLINE set& operator=(BOOST_RV_REF(set) x) BOOST_NOEXCEPT_IF( (allocator_traits_type::propagate_on_container_move_assignment::value || allocator_traits_type::is_always_equal::value) && - boost::container::container_detail::is_nothrow_move_assignable::value) + boost::container::dtl::is_nothrow_move_assignable::value) { return static_cast(this->base_t::operator=(BOOST_MOVE_BASE(base_t, x))); } #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST) @@ -639,8 +639,8 @@ class set template BOOST_CONTAINER_FORCEINLINE void merge(set& source) { - typedef container_detail::tree - , C2, Allocator, Options> base2_t; + typedef dtl::tree + , C2, Allocator, Options> base2_t; this->base_t::merge_unique(static_cast(source)); } @@ -653,8 +653,8 @@ class set template BOOST_CONTAINER_FORCEINLINE void merge(multiset& source) { - typedef container_detail::tree - , C2, Allocator, Options> base2_t; + typedef dtl::tree + , C2, Allocator, Options> base2_t; this->base_t::merge_unique(static_cast(source)); } @@ -701,7 +701,7 @@ class set //! Complexity: Constant. void swap(set& x) BOOST_NOEXCEPT_IF( allocator_traits_type::is_always_equal::value - && boost::container::container_detail::is_nothrow_swappable::value ); + && boost::container::dtl::is_nothrow_swappable::value ); //! Effects: erase(a.begin(),a.end()). //! @@ -893,15 +893,15 @@ template #endif class multiset /// @cond - : public container_detail::tree - , Compare, Allocator, Options> + : public dtl::tree + , Compare, Allocator, Options> /// @endcond { #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED private: BOOST_COPYABLE_AND_MOVABLE(multiset) - typedef container_detail::tree - , Compare, Allocator, Options> base_t; + typedef dtl::tree + , Compare, Allocator, Options> base_t; #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED public: @@ -938,8 +938,8 @@ class multiset //! @copydoc ::boost::container::set::set() BOOST_CONTAINER_FORCEINLINE multiset() - BOOST_NOEXCEPT_IF(container_detail::is_nothrow_default_constructible::value && - container_detail::is_nothrow_default_constructible::value) + BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible::value && + dtl::is_nothrow_default_constructible::value) : base_t() {} @@ -1068,7 +1068,7 @@ class multiset //! @copydoc ::boost::container::set::set(set &&) BOOST_CONTAINER_FORCEINLINE multiset(BOOST_RV_REF(multiset) x) - BOOST_NOEXCEPT_IF(boost::container::container_detail::is_nothrow_move_constructible::value) + BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_constructible::value) : base_t(BOOST_MOVE_BASE(base_t, x)) {} @@ -1090,7 +1090,7 @@ class multiset BOOST_CONTAINER_FORCEINLINE multiset& operator=(BOOST_RV_REF(multiset) x) BOOST_NOEXCEPT_IF( (allocator_traits_type::propagate_on_container_move_assignment::value || allocator_traits_type::is_always_equal::value) && - boost::container::container_detail::is_nothrow_move_assignable::value) + boost::container::dtl::is_nothrow_move_assignable::value) { return static_cast(this->base_t::operator=(BOOST_MOVE_BASE(base_t, x))); } #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST) @@ -1269,8 +1269,8 @@ class multiset template BOOST_CONTAINER_FORCEINLINE void merge(multiset& source) { - typedef container_detail::tree - , C2, Allocator, Options> base2_t; + typedef dtl::tree + , C2, Allocator, Options> base2_t; this->base_t::merge_equal(static_cast(source)); } @@ -1283,8 +1283,8 @@ class multiset template BOOST_CONTAINER_FORCEINLINE void merge(set& source) { - typedef container_detail::tree - , C2, Allocator, Options> base2_t; + typedef dtl::tree + , C2, Allocator, Options> base2_t; this->base_t::merge_equal(static_cast(source)); } @@ -1313,7 +1313,7 @@ class multiset //! @copydoc ::boost::container::set::swap void swap(multiset& x) BOOST_NOEXCEPT_IF( allocator_traits_type::is_always_equal::value - && boost::container::container_detail::is_nothrow_swappable::value ); + && boost::container::dtl::is_nothrow_swappable::value ); //! @copydoc ::boost::container::set::clear void clear() BOOST_NOEXCEPT_OR_NOTHROW; diff --git a/include/boost/container/slist.hpp b/include/boost/container/slist.hpp index 3a1d66b..272a11c 100644 --- a/include/boost/container/slist.hpp +++ b/include/boost/container/slist.hpp @@ -61,13 +61,13 @@ namespace container { template class slist; -namespace container_detail { +namespace dtl { template struct slist_hook { - typedef typename container_detail::bi::make_slist_base_hook - , container_detail::bi::link_mode >::type type; + typedef typename dtl::bi::make_slist_base_hook + , dtl::bi::link_mode >::type type; }; template @@ -104,20 +104,20 @@ struct intrusive_slist_type ::template rebind_pointer::type void_pointer; - typedef typename container_detail::slist_node + typedef typename dtl::slist_node node_type; - typedef typename container_detail::bi::make_slist + typedef typename dtl::bi::make_slist ::type> - ,container_detail::bi::constant_time_size - , container_detail::bi::size_type + ,dtl::bi::base_hook::type> + ,dtl::bi::constant_time_size + , dtl::bi::size_type >::type container_type; typedef container_type type ; }; -} //namespace container_detail { +} //namespace dtl { #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED @@ -162,26 +162,26 @@ template > template #endif class slist - : protected container_detail::node_alloc_holder - ::type> + : protected dtl::node_alloc_holder + ::type> { #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED typedef typename - container_detail::intrusive_slist_type::type Icont; - typedef container_detail::node_alloc_holder AllocHolder; + dtl::intrusive_slist_type::type Icont; + typedef dtl::node_alloc_holder AllocHolder; typedef typename AllocHolder::NodePtr NodePtr; typedef typename AllocHolder::NodeAlloc NodeAlloc; typedef typename AllocHolder::ValAlloc ValAlloc; typedef typename AllocHolder::Node Node; - typedef container_detail::allocator_destroyer Destroyer; + typedef dtl::allocator_destroyer Destroyer; typedef typename AllocHolder::alloc_version alloc_version; typedef boost::container:: allocator_traits allocator_traits_type; typedef boost::container::equal_to_value equal_to_value_type; BOOST_COPYABLE_AND_MOVABLE(slist) - typedef container_detail::iterator_from_iiterator iterator_impl; - typedef container_detail::iterator_from_iiterator const_iterator_impl; + typedef dtl::iterator_from_iiterator iterator_impl; + typedef dtl::iterator_from_iiterator const_iterator_impl; #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED public: @@ -216,7 +216,7 @@ class slist //! Throws: If allocator_type's copy constructor throws. //! //! Complexity: Constant. - slist() BOOST_NOEXCEPT_IF(container_detail::is_nothrow_default_constructible::value) + slist() BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible::value) : AllocHolder() {} @@ -357,7 +357,7 @@ class slist if (&x != this){ NodeAlloc &this_alloc = this->node_alloc(); const NodeAlloc &x_alloc = x.node_alloc(); - container_detail::bool_ flag; if(flag && this_alloc != x_alloc){ this->clear(); @@ -442,7 +442,7 @@ class slist template void assign(InpIt first, InpIt last #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) - , typename container_detail::disable_if_convertible::type * = 0 + , typename dtl::disable_if_convertible::type * = 0 #endif ) { @@ -846,10 +846,10 @@ class slist template iterator insert_after(const_iterator prev_p, InpIt first, InpIt last #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) - , typename container_detail::enable_if_c - < !container_detail::is_convertible::value - && (container_detail::is_input_iterator::value - || container_detail::is_same::value + , typename dtl::enable_if_c + < !dtl::is_convertible::value + && (dtl::is_input_iterator::value + || dtl::is_same::value ) >::type * = 0 #endif @@ -884,10 +884,10 @@ class slist #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) template iterator insert_after(const_iterator prev, FwdIt first, FwdIt last - , typename container_detail::enable_if_c - < !container_detail::is_convertible::value - && !(container_detail::is_input_iterator::value - || container_detail::is_same::value + , typename dtl::enable_if_c + < !dtl::is_convertible::value + && !(dtl::is_input_iterator::value + || dtl::is_same::value ) >::type * = 0 ) diff --git a/include/boost/container/small_vector.hpp b/include/boost/container/small_vector.hpp index 804740c..2698bdd 100644 --- a/include/boost/container/small_vector.hpp +++ b/include/boost/container/small_vector.hpp @@ -118,11 +118,11 @@ class small_vector_allocator typedef typename allocator_traits::propagate_on_container_move_assignment propagate_on_container_move_assignment; typedef typename allocator_traits::propagate_on_container_swap propagate_on_container_swap; //! An integral constant with member `value == false` - typedef BOOST_CONTAINER_IMPDEF(container_detail::bool_) is_always_equal; + typedef BOOST_CONTAINER_IMPDEF(dtl::bool_) is_always_equal; //! An integral constant with member `value == true` - typedef BOOST_CONTAINER_IMPDEF(container_detail::bool_) is_partially_propagable; + typedef BOOST_CONTAINER_IMPDEF(dtl::bool_) is_partially_propagable; - BOOST_CONTAINER_DOCIGN(typedef container_detail::version_type version;) + BOOST_CONTAINER_DOCIGN(typedef dtl::version_type version;) //!Obtains an small_vector_allocator that allocates //!objects of type T2 @@ -282,7 +282,7 @@ class small_vector_allocator pointer internal_storage() const { typedef typename Allocator::value_type value_type; - typedef container_detail::vector_alloc_holder< small_vector_allocator > vector_alloc_holder_t; + typedef dtl::vector_alloc_holder< small_vector_allocator > vector_alloc_holder_t; typedef vector > vector_base; typedef small_vector_base derived_type; // @@ -345,8 +345,8 @@ class small_vector_base const base_type &as_base() const { return static_cast(*this); } public: - typedef typename container_detail::aligned_storage - ::value>::type storage_type; + typedef typename dtl::aligned_storage + ::value>::type storage_type; typedef small_vector_allocator allocator_type; protected: @@ -419,7 +419,7 @@ struct small_vector_storage_calculator { typedef small_vector_base svh_type; typedef vector > svhb_type; - static const std::size_t s_align = container_detail::alignment_of::value; + static const std::size_t s_align = dtl::alignment_of::value; static const std::size_t s_size = sizeof(Storage); static const std::size_t svh_sizeof = sizeof(svh_type); static const std::size_t svhb_sizeof = sizeof(svhb_type); @@ -507,7 +507,7 @@ class small_vector : public small_vector_base public: BOOST_CONTAINER_FORCEINLINE small_vector() - BOOST_NOEXCEPT_IF(container_detail::is_nothrow_default_constructible::value) + BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible::value) : base_type(initial_capacity_t(), internal_capacity()) {} @@ -541,18 +541,18 @@ class small_vector : public small_vector_base template BOOST_CONTAINER_FORCEINLINE small_vector(InIt first, InIt last - BOOST_CONTAINER_DOCIGN(BOOST_MOVE_I typename container_detail::disable_if_c - < container_detail::is_convertible::value - BOOST_MOVE_I container_detail::nat >::type * = 0) + BOOST_CONTAINER_DOCIGN(BOOST_MOVE_I typename dtl::disable_if_c + < dtl::is_convertible::value + BOOST_MOVE_I dtl::nat >::type * = 0) ) : base_type(initial_capacity_t(), internal_capacity()) { this->assign(first, last); } template BOOST_CONTAINER_FORCEINLINE small_vector(InIt first, InIt last, const allocator_type& a - BOOST_CONTAINER_DOCIGN(BOOST_MOVE_I typename container_detail::disable_if_c - < container_detail::is_convertible::value - BOOST_MOVE_I container_detail::nat >::type * = 0) + BOOST_CONTAINER_DOCIGN(BOOST_MOVE_I typename dtl::disable_if_c + < dtl::is_convertible::value + BOOST_MOVE_I dtl::nat >::type * = 0) ) : base_type(initial_capacity_t(), internal_capacity(), a) { this->assign(first, last); } diff --git a/include/boost/container/stable_vector.hpp b/include/boost/container/stable_vector.hpp index cf156e0..88518bc 100644 --- a/include/boost/container/stable_vector.hpp +++ b/include/boost/container/stable_vector.hpp @@ -245,7 +245,7 @@ class stable_vector_iterator typedef std::random_access_iterator_tag iterator_category; typedef typename non_const_ptr_traits::element_type value_type; typedef typename non_const_ptr_traits::difference_type difference_type; - typedef typename ::boost::container::container_detail::if_c + typedef typename ::boost::container::dtl::if_c < IsConst , typename non_const_ptr_traits::template rebind_pointer::type @@ -464,14 +464,14 @@ class stable_vector typedef typename node_ptr_traits::reference node_reference; typedef typename const_node_ptr_traits::reference const_node_reference; - typedef ::boost::container::container_detail::integral_constant - ::value> alloc_version; typedef typename allocator_traits_type:: template portable_rebind_alloc ::type node_allocator_type; - typedef ::boost::container::container_detail:: + typedef ::boost::container::dtl:: allocator_version_traits allocator_version_traits_t; typedef typename allocator_version_traits_t::multiallocation_chain multiallocation_chain; @@ -540,7 +540,7 @@ class stable_vector //! Throws: If allocator_type's default constructor throws. //! //! Complexity: Constant. - stable_vector() BOOST_NOEXCEPT_IF(container_detail::is_nothrow_default_constructible::value) + stable_vector() BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible::value) : internal_data(), index() { STABLE_VECTOR_CHECK_INVARIANT; @@ -765,14 +765,14 @@ class stable_vector if (&x != this){ node_allocator_type &this_alloc = this->priv_node_alloc(); const node_allocator_type &x_alloc = x.priv_node_alloc(); - container_detail::bool_ flag; if(flag && this_alloc != x_alloc){ this->clear(); this->shrink_to_fit(); } - container_detail::assign_alloc(this->priv_node_alloc(), x.priv_node_alloc(), flag); - container_detail::assign_alloc(this->index.get_stored_allocator(), x.index.get_stored_allocator(), flag); + dtl::assign_alloc(this->priv_node_alloc(), x.priv_node_alloc(), flag); + dtl::assign_alloc(this->index.get_stored_allocator(), x.index.get_stored_allocator(), flag); this->assign(x.begin(), x.end()); } return *this; @@ -799,7 +799,7 @@ class stable_vector node_allocator_type &x_alloc = x.priv_node_alloc(); const bool propagate_alloc = allocator_traits_type:: propagate_on_container_move_assignment::value; - container_detail::bool_ flag; + dtl::bool_ flag; const bool allocators_equal = this_alloc == x_alloc; (void)allocators_equal; //Resources can be transferred if both allocators are //going to be equal after this function (either propagated or already equal) @@ -808,7 +808,7 @@ class stable_vector //Destroy objects but retain memory in case x reuses it in the future this->clear(); //Move allocator if needed - container_detail::move_alloc(this_alloc, x_alloc, flag); + dtl::move_alloc(this_alloc, x_alloc, flag); //Take resources this->index.swap(x.index); this->priv_swap_members(x); @@ -852,7 +852,7 @@ class stable_vector //! Complexity: Linear to n. template #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) - typename container_detail::disable_if_convertible::type + typename dtl::disable_if_convertible::type #else void #endif @@ -1537,10 +1537,10 @@ class stable_vector #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) //Put this as argument instead of the return type as old GCC's like 3.4 //detect this and the next disable_if_or as overloads - , typename container_detail::disable_if_or + , typename dtl::disable_if_or < void - , container_detail::is_convertible - , container_detail::is_not_input_iterator + , dtl::is_convertible + , dtl::is_not_input_iterator >::type* = 0 #endif ) @@ -1556,10 +1556,10 @@ class stable_vector #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) template - typename container_detail::disable_if_or + typename dtl::disable_if_or < iterator - , container_detail::is_convertible - , container_detail::is_input_iterator + , dtl::is_convertible + , dtl::is_input_iterator >::type insert(const_iterator p, FwdIt first, FwdIt last) { @@ -1672,8 +1672,8 @@ class stable_vector allocator_traits_type::is_always_equal::value || this->get_stored_allocator() == x.get_stored_allocator()); STABLE_VECTOR_CHECK_INVARIANT; - container_detail::bool_ flag; - container_detail::swap_alloc(this->priv_node_alloc(), x.priv_node_alloc(), flag); + dtl::bool_ flag; + dtl::swap_alloc(this->priv_node_alloc(), x.priv_node_alloc(), flag); //vector's allocator is swapped here this->index.swap(x.index); this->priv_swap_members(x); @@ -1956,7 +1956,7 @@ class stable_vector void priv_destroy_node(const node_type &n) { allocator_traits:: - destroy(this->priv_node_alloc(), container_detail::addressof(n.value)); + destroy(this->priv_node_alloc(), dtl::addressof(n.value)); static_cast(&n)->~node_base_type(); } @@ -1972,7 +1972,7 @@ class stable_vector //This can throw boost::container::construct_in_place ( this->priv_node_alloc() - , container_detail::addressof(p->value) + , dtl::addressof(p->value) , it); //This does not throw ::new(static_cast(boost::movelib::to_raw_pointer(p)), boost_container_new_t()) @@ -1985,7 +1985,7 @@ class stable_vector //This can throw boost::container::allocator_traits::construct ( this->priv_node_alloc() - , container_detail::addressof(p->value) + , dtl::addressof(p->value) , ::boost::forward(value_convertible)); //This does not throw ::new(static_cast(boost::movelib::to_raw_pointer(p)), boost_container_new_t()) node_base_type; diff --git a/include/boost/container/static_vector.hpp b/include/boost/container/static_vector.hpp index 4a341c3..01216f2 100644 --- a/include/boost/container/static_vector.hpp +++ b/include/boost/container/static_vector.hpp @@ -33,7 +33,7 @@ namespace boost { namespace container { #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED -namespace container_detail { +namespace dtl { template class static_storage_allocator @@ -61,7 +61,7 @@ class static_storage_allocator std::size_t max_size() const { return N; } - typedef boost::container::container_detail::version_type version; + typedef boost::container::dtl::version_type version; BOOST_CONTAINER_FORCEINLINE friend bool operator==(const static_storage_allocator &, const static_storage_allocator &) BOOST_NOEXCEPT_OR_NOTHROW { return false; } @@ -73,7 +73,7 @@ class static_storage_allocator typename aligned_storage::value>::type storage; }; -} //namespace container_detail { +} //namespace dtl { #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED @@ -103,10 +103,10 @@ class static_storage_allocator //!@tparam Capacity The maximum number of elements static_vector can store, fixed at compile time. template class static_vector - : public vector > + : public vector > { #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED - typedef vector > base_t; + typedef vector > base_t; BOOST_COPYABLE_AND_MOVABLE(static_vector) @@ -114,7 +114,7 @@ class static_vector friend class static_vector; public: - typedef container_detail::static_storage_allocator allocator_type; + typedef dtl::static_storage_allocator allocator_type; #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED public: @@ -259,7 +259,7 @@ public: {} BOOST_CONTAINER_FORCEINLINE static_vector(BOOST_RV_REF(static_vector) other, const allocator_type &) - BOOST_NOEXCEPT_IF(boost::container::container_detail::is_nothrow_move_constructible::value) + BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_constructible::value) : base_t(BOOST_MOVE_BASE(base_t, other)) {} @@ -294,7 +294,7 @@ public: //! @par Complexity //! Linear O(N). BOOST_CONTAINER_FORCEINLINE static_vector(BOOST_RV_REF(static_vector) other) - BOOST_NOEXCEPT_IF(boost::container::container_detail::is_nothrow_move_constructible::value) + BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_constructible::value) : base_t(BOOST_MOVE_BASE(base_t, other)) {} @@ -1228,7 +1228,7 @@ inline void swap(static_vector & x, static_vector & y); template inline void swap(static_vector & x, static_vector & y - , typename container_detail::enable_if_c< C1 != C2>::type * = 0) + , typename dtl::enable_if_c< C1 != C2>::type * = 0) { x.swap(y); } diff --git a/include/boost/container/string.hpp b/include/boost/container/string.hpp index cba6325..d6c8be2 100644 --- a/include/boost/container/string.hpp +++ b/include/boost/container/string.hpp @@ -70,7 +70,7 @@ namespace boost { namespace container { #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED -namespace container_detail { +namespace dtl { // ------------------------------------------------------------ // Class basic_string_base. @@ -170,8 +170,8 @@ class basic_string_base //This type has the same alignment and size as long_t but it's POD //so, unlike long_t, it can be placed in a union - typedef typename container_detail::aligned_storage - ::value>::type long_raw_t; + typedef typename dtl::aligned_storage + ::value>::type long_raw_t; protected: static const size_type MinInternalBufferChars = 8; @@ -274,8 +274,8 @@ class basic_string_base protected: - typedef container_detail::integral_constant::value> alloc_version; + typedef dtl::integral_constant::value> alloc_version; pointer allocation_command(allocation_type command, size_type limit_size, @@ -286,7 +286,7 @@ class basic_string_base reuse = 0; command &= ~(expand_fwd | expand_bwd); } - return container_detail::allocator_version_traits::allocation_command + return dtl::allocator_version_traits::allocation_command (this->alloc(), command, limit_size, prefer_in_recvd_out_size, reuse); } @@ -460,7 +460,7 @@ class basic_string_base } }; -} //namespace container_detail { +} //namespace dtl { #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED @@ -502,13 +502,13 @@ template , class Allocator = template #endif class basic_string - : private container_detail::basic_string_base + : private dtl::basic_string_base { #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED private: typedef allocator_traits allocator_traits_type; BOOST_COPYABLE_AND_MOVABLE(basic_string) - typedef container_detail::basic_string_base base_t; + typedef dtl::basic_string_base base_t; static const typename base_t::size_type InternalBufferChars = base_t::InternalBufferChars; protected: @@ -598,7 +598,7 @@ class basic_string //! Effects: Default constructs a basic_string. //! //! Throws: If allocator_type's default constructor throws. - basic_string() BOOST_NOEXCEPT_IF(container_detail::is_nothrow_default_constructible::value) + basic_string() BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible::value) : base_t() { this->priv_terminate_string(); } @@ -689,7 +689,7 @@ class basic_string throw_out_of_range("basic_string::basic_string out of range position"); else this->assign - (s.begin() + pos, s.begin() + pos + container_detail::min_value(n, s.size() - pos)); + (s.begin() + pos, s.begin() + pos + dtl::min_value(n, s.size() - pos)); } //! Effects: Constructs a basic_string taking the allocator as parameter, @@ -702,7 +702,7 @@ class basic_string throw_out_of_range("basic_string::basic_string out of range position"); else this->assign - (s.begin() + pos, s.begin() + pos + container_detail::min_value(n, s.size() - pos)); + (s.begin() + pos, s.begin() + pos + dtl::min_value(n, s.size() - pos)); } //! Effects: Constructs a basic_string taking a default-constructed allocator, @@ -827,7 +827,7 @@ class basic_string if (&x != this){ allocator_type &this_alloc = this->alloc(); const allocator_type &x_alloc = x.alloc(); - container_detail::bool_ flag; if(flag && this_alloc != x_alloc){ if(!this->is_short()){ @@ -837,7 +837,7 @@ class basic_string this->priv_short_size(0); } } - container_detail::assign_alloc(this->alloc(), x.alloc(), flag); + dtl::assign_alloc(this->alloc(), x.alloc(), flag); this->assign(x.begin(), x.end()); } return *this; @@ -861,7 +861,7 @@ class basic_string allocator_type &x_alloc = x.alloc(); const bool propagate_alloc = allocator_traits_type:: propagate_on_container_move_assignment::value; - container_detail::bool_ flag; + dtl::bool_ flag; const bool allocators_equal = this_alloc == x_alloc; (void)allocators_equal; //Resources can be transferred if both allocators are //going to be equal after this function (either propagated or already equal) @@ -869,7 +869,7 @@ class basic_string //Destroy objects but retain memory in case x reuses it in the future this->clear(); //Move allocator if needed - container_detail::move_alloc(this_alloc, x_alloc, flag); + dtl::move_alloc(this_alloc, x_alloc, flag); //Nothrow swap this->swap_data(x); } @@ -1356,7 +1356,7 @@ class basic_string if (pos > s.size()) throw_out_of_range("basic_string::append out of range position"); return this->append(s.begin() + pos, - s.begin() + pos + container_detail::min_value(n, s.size() - pos)); + s.begin() + pos + dtl::min_value(n, s.size() - pos)); } //! Requires: s points to an array of at least n elements of CharT. @@ -1457,7 +1457,7 @@ class basic_string if (pos > s.size()) throw_out_of_range("basic_string::assign out of range position"); return this->assign(s.begin() + pos, - s.begin() + pos + container_detail::min_value(n, s.size() - pos)); + s.begin() + pos + dtl::min_value(n, s.size() - pos)); } //! Requires: s points to an array of at least n elements of CharT. @@ -1505,7 +1505,7 @@ class basic_string template basic_string& assign(InputIter first, InputIter last #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) - , typename container_detail::disable_if_convertible::type * = 0 + , typename dtl::disable_if_convertible::type * = 0 #endif ) { @@ -1567,7 +1567,7 @@ class basic_string const size_type str_size = s.size(); if (pos1 > sz || pos2 > str_size) throw_out_of_range("basic_string::insert out of range position"); - size_type len = container_detail::min_value(n, str_size - pos2); + size_type len = dtl::min_value(n, str_size - pos2); if (sz > this->max_size() - len) throw_length_error("basic_string::insert max_size() exceeded"); const CharT *beg_ptr = boost::movelib::to_raw_pointer(s.begin()) + pos2; @@ -1666,10 +1666,10 @@ class basic_string template iterator insert(const_iterator p, InputIter first, InputIter last #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) - , typename container_detail::disable_if_or + , typename dtl::disable_if_or < void - , container_detail::is_convertible - , container_detail::is_not_input_iterator + , dtl::is_convertible + , dtl::is_not_input_iterator >::type * = 0 #endif ) @@ -1684,10 +1684,10 @@ class basic_string #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) template iterator insert(const_iterator p, ForwardIter first, ForwardIter last - , typename container_detail::disable_if_or + , typename dtl::disable_if_or < void - , container_detail::is_convertible - , container_detail::is_input_iterator + , dtl::is_convertible + , dtl::is_input_iterator >::type * = 0 ) { @@ -1834,7 +1834,7 @@ class basic_string if (pos > this->size()) throw_out_of_range("basic_string::erase out of range position"); const pointer addr = this->priv_addr(); - erase(addr + pos, addr + pos + container_detail::min_value(n, this->size() - pos)); + erase(addr + pos, addr + pos + dtl::min_value(n, this->size() - pos)); return *this; } @@ -1903,7 +1903,7 @@ class basic_string { if (pos1 > this->size()) throw_out_of_range("basic_string::replace out of range position"); - const size_type len = container_detail::min_value(n1, this->size() - pos1); + const size_type len = dtl::min_value(n1, this->size() - pos1); if (this->size() - len >= this->max_size() - str.size()) throw_length_error("basic_string::replace max_size() exceeded"); const pointer addr = this->priv_addr(); @@ -1934,7 +1934,7 @@ class basic_string { if (pos2 > str.size()) throw_out_of_range("basic_string::replace out of range position"); - return this->replace(pos1, n1, str.data()+pos2, container_detail::min_value(n2, str.size() - pos2)); + return this->replace(pos1, n1, str.data()+pos2, dtl::min_value(n2, str.size() - pos2)); } //! Throws: out_of_range if pos1 > size() or pos2 > sv.size(). @@ -1949,7 +1949,7 @@ class basic_string { if (pos2 > sv.size()) throw_out_of_range("basic_string::replace out of range position"); - return this->replace(pos1, n1, sv.data()+pos2, container_detail::min_value(n2, sv.size() - pos2)); + return this->replace(pos1, n1, sv.data()+pos2, dtl::min_value(n2, sv.size() - pos2)); } //! Requires: pos1 <= size() and s points to an array of at least n2 elements of CharT. @@ -1970,7 +1970,7 @@ class basic_string { if (pos1 > this->size()) throw_out_of_range("basic_string::replace out of range position"); - const size_type len = container_detail::min_value(n1, this->size() - pos1); + const size_type len = dtl::min_value(n1, this->size() - pos1); const size_type max_size = this->max_size(); if (n2 > max_size || (this->size() - len) >= (max_size - n2)) throw_length_error("basic_string::replace max_size() exceeded"); @@ -2009,7 +2009,7 @@ class basic_string { if (pos1 > this->size()) throw_out_of_range("basic_string::replace out of range position"); - const size_type len = container_detail::min_value(n1, this->size() - pos1); + const size_type len = dtl::min_value(n1, this->size() - pos1); if (n2 > this->max_size() || this->size() - len >= this->max_size() - n2) throw_length_error("basic_string::replace max_size() exceeded"); const pointer addr = this->priv_addr(); @@ -2079,10 +2079,10 @@ class basic_string template basic_string& replace(const_iterator i1, const_iterator i2, InputIter j1, InputIter j2 #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) - , typename container_detail::disable_if_or + , typename dtl::disable_if_or < void - , container_detail::is_convertible - , container_detail::is_input_iterator + , dtl::is_convertible + , dtl::is_input_iterator >::type * = 0 #endif ) @@ -2101,10 +2101,10 @@ class basic_string #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) template basic_string& replace(const_iterator i1, const_iterator i2, ForwardIter j1, ForwardIter j2 - , typename container_detail::disable_if_or + , typename dtl::disable_if_or < void - , container_detail::is_convertible - , container_detail::is_not_input_iterator + , dtl::is_convertible + , dtl::is_not_input_iterator >::type * = 0 ) { @@ -2165,7 +2165,7 @@ class basic_string { if (pos > this->size()) throw_out_of_range("basic_string::copy out of range position"); - const size_type len = container_detail::min_value(n, this->size() - pos); + const size_type len = dtl::min_value(n, this->size() - pos); Traits::copy(s, boost::movelib::to_raw_pointer(this->priv_addr() + pos), len); return len; } @@ -2179,8 +2179,8 @@ class basic_string || allocator_traits_type::is_always_equal::value) { this->base_t::swap_data(x); - container_detail::bool_ flag; - container_detail::swap_alloc(this->alloc(), x.alloc(), flag); + dtl::bool_ flag; + dtl::swap_alloc(this->alloc(), x.alloc(), flag); } ////////////////////////////////////////////// @@ -2340,9 +2340,9 @@ class basic_string if (n > len) return npos; else if (n == 0) - return container_detail::min_value(len, pos); + return dtl::min_value(len, pos); else { - const const_iterator last = begin() + container_detail::min_value(len - n, pos) + n; + const const_iterator last = begin() + dtl::min_value(len - n, pos) + n; const const_iterator result = find_end(begin(), last, s, s + n, Eq_traits()); @@ -2369,7 +2369,7 @@ class basic_string if (len < 1) return npos; else { - const const_iterator last = begin() + container_detail::min_value(len - 1, pos) + 1; + const const_iterator last = begin() + dtl::min_value(len - 1, pos) + 1; const_reverse_iterator rresult = boost::container::find_if(const_reverse_iterator(last), rend(), boost::container::bind2nd(Eq_traits(), c)); @@ -2467,7 +2467,7 @@ class basic_string return npos; else { const pointer addr = this->priv_addr(); - const const_iterator last = addr + container_detail::min_value(len - 1, pos) + 1; + const const_iterator last = addr + dtl::min_value(len - 1, pos) + 1; const const_reverse_iterator rresult = boost::container::find_first_of(const_reverse_iterator(last), rend(), s, s + n, Eq_traits()); @@ -2588,7 +2588,7 @@ class basic_string if (len < 1) return npos; else { - const const_iterator last = begin() + container_detail::min_value(len - 1, pos) + 1; + const const_iterator last = begin() + dtl::min_value(len - 1, pos) + 1; const const_reverse_iterator rresult = boost::container::find_if(const_reverse_iterator(last), rend(), Not_within_traits(s, s + n)); @@ -2614,7 +2614,7 @@ class basic_string if (len < 1) return npos; else { - const const_iterator last = begin() + container_detail::min_value(len - 1, pos) + 1; + const const_iterator last = begin() + dtl::min_value(len - 1, pos) + 1; const const_reverse_iterator rresult = boost::container::find_if(const_reverse_iterator(last), rend(), boost::container::not1(boost::container::bind2nd(Eq_traits(), c))); @@ -2636,7 +2636,7 @@ class basic_string throw_out_of_range("basic_string::substr out of range position"); const pointer addr = this->priv_addr(); return basic_string(addr + pos, - addr + pos + container_detail::min_value(n, size() - pos), this->alloc()); + addr + pos + dtl::min_value(n, size() - pos), this->alloc()); } //! Effects: Determines the effective length rlen of the string to compare as @@ -2681,7 +2681,7 @@ class basic_string const pointer addr = this->priv_addr(); const pointer str_addr = str.priv_addr(); return s_compare(addr + pos1, - addr + pos1 + container_detail::min_value(n1, this->size() - pos1), + addr + pos1 + dtl::min_value(n1, this->size() - pos1), str_addr, str_addr + str.priv_size()); } @@ -2697,7 +2697,7 @@ class basic_string throw_out_of_range("basic_string::compare out of range position"); const pointer addr = this->priv_addr() + pos1; const CharT* str_addr = sv.data(); - return s_compare(addr, addr + container_detail::min_value(n1, this->size() - pos1), + return s_compare(addr, addr + dtl::min_value(n1, this->size() - pos1), str_addr, str_addr + sv.size()); } @@ -2715,8 +2715,8 @@ class basic_string throw_out_of_range("basic_string::compare out of range position"); const pointer addr = this->priv_addr() + pos1; const pointer str_addr = str.priv_addr() + pos2; - return s_compare(addr, addr + container_detail::min_value(n1, this->size() - pos1), - str_addr, str_addr + container_detail::min_value(n2, str.size() - pos2)); + return s_compare(addr, addr + dtl::min_value(n1, this->size() - pos1), + str_addr, str_addr + dtl::min_value(n2, str.size() - pos2)); } //! Requires: pos1 <= size() and pos2 <= str.size() @@ -2734,8 +2734,8 @@ class basic_string throw_out_of_range("basic_string::compare out of range position"); const pointer addr = this->priv_addr() + pos1; const CharT * str_addr = sv.data() + pos2; - return s_compare(addr, addr + container_detail::min_value(n1, this->size() - pos1), - str_addr, str_addr + container_detail::min_value(n2, sv.size() - pos2)); + return s_compare(addr, addr + dtl::min_value(n1, this->size() - pos1), + str_addr, str_addr + dtl::min_value(n2, sv.size() - pos2)); } //! Throws: Nothing @@ -2758,7 +2758,7 @@ class basic_string throw_out_of_range("basic_string::compare out of range position"); const pointer addr = this->priv_addr(); return s_compare( addr + pos1, - addr + pos1 + container_detail::min_value(n1, this->size() - pos1), + addr + pos1 + dtl::min_value(n1, this->size() - pos1), s, s + n2); } @@ -2779,7 +2779,7 @@ class basic_string } if (this->capacity() < res_arg){ - size_type n = container_detail::max_value(res_arg, this->size()) + 1; + size_type n = dtl::max_value(res_arg, this->size()) + 1; size_type new_cap = this->next_capacity(n); pointer reuse = 0; pointer new_start = this->allocation_command(allocate_new, n, new_cap, reuse); @@ -2806,14 +2806,14 @@ class basic_string const difference_type n2 = l2 - f2; const int cmp = Traits::compare(boost::movelib::to_raw_pointer(f1), boost::movelib::to_raw_pointer(f2), - container_detail::min_value(n1, n2)); + dtl::min_value(n1, n2)); return cmp != 0 ? cmp : (n1 < n2 ? -1 : (n1 > n2 ? 1 : 0)); } template void priv_shrink_to_fit_dynamic_buffer ( AllocVersion - , typename container_detail::enable_if >::type* = 0) + , typename dtl::enable_if >::type* = 0) { //Allocate a new buffer. size_type real_cap = 0; @@ -2843,7 +2843,7 @@ class basic_string template void priv_shrink_to_fit_dynamic_buffer ( AllocVersion - , typename container_detail::enable_if >::type* = 0) + , typename dtl::enable_if >::type* = 0) { size_type received_size = this->priv_long_size()+1; pointer hint = this->priv_long_addr(); @@ -2920,13 +2920,13 @@ class basic_string template basic_string& priv_replace_dispatch(const_iterator first, const_iterator last, Integer n, Integer x, - container_detail::true_) + dtl::true_) { return this->replace(first, last, (size_type) n, (CharT) x); } template basic_string& priv_replace_dispatch(const_iterator first, const_iterator last, InputIter f, InputIter l, - container_detail::false_) + dtl::false_) { typedef typename boost::container::iterator_traits::iterator_category Category; return this->priv_replace(first, last, f, l, Category()); @@ -3080,7 +3080,7 @@ operator==(const basic_string& x, const CharT* s) template class BasicStringView> inline BOOST_CONTAINER_DOC1ST( bool, - typename container_detail::disable_if + typename dtl::disable_if > BOOST_MOVE_I bool >::type) operator==( BasicStringView x, const basic_string& y) { @@ -3091,7 +3091,7 @@ inline template class BasicStringView> inline BOOST_CONTAINER_DOC1ST( bool, - typename container_detail::disable_if + typename dtl::disable_if > BOOST_MOVE_I bool >::type) operator==( const basic_string& x, BasicStringView y) { @@ -3118,7 +3118,7 @@ operator!=(const basic_string& x, const CharT* s) template class BasicStringView> inline BOOST_CONTAINER_DOC1ST( bool, - typename container_detail::disable_if + typename dtl::disable_if > BOOST_MOVE_I bool >::type) operator!=( BasicStringView x, const basic_string& y) { return !(x == y); } @@ -3126,7 +3126,7 @@ operator!=( BasicStringView x, const basic_string class BasicStringView> inline BOOST_CONTAINER_DOC1ST( bool, - typename container_detail::disable_if + typename dtl::disable_if > BOOST_MOVE_I bool >::type) operator!=( const basic_string& x, BasicStringView y) { return !(x == y); } @@ -3156,7 +3156,7 @@ operator<(const basic_string& x, const CharT* s) template class BasicStringView> inline BOOST_CONTAINER_DOC1ST( bool, - typename container_detail::disable_if + typename dtl::disable_if > BOOST_MOVE_I bool >::type) operator<( BasicStringView x, const basic_string& y) { return y.compare(x) > 0; } @@ -3164,7 +3164,7 @@ operator<( BasicStringView x, const basic_string class BasicStringView> inline BOOST_CONTAINER_DOC1ST( bool, - typename container_detail::disable_if + typename dtl::disable_if > BOOST_MOVE_I bool >::type) operator<( const basic_string& x, BasicStringView y) { return x.compare(y) < 0; } @@ -3191,7 +3191,7 @@ operator>(const basic_string& x, const CharT* s) template class BasicStringView> inline BOOST_CONTAINER_DOC1ST( bool, - typename container_detail::disable_if + typename dtl::disable_if > BOOST_MOVE_I bool >::type) operator>( BasicStringView x, const basic_string& y) { return y < x; } @@ -3199,7 +3199,7 @@ operator>( BasicStringView x, const basic_string class BasicStringView> inline BOOST_CONTAINER_DOC1ST( bool, - typename container_detail::disable_if + typename dtl::disable_if > BOOST_MOVE_I bool >::type) operator>( const basic_string& x, BasicStringView y) { return y < x; } @@ -3225,7 +3225,7 @@ operator<=(const basic_string& x, const CharT* s) template class BasicStringView> inline BOOST_CONTAINER_DOC1ST( bool, - typename container_detail::disable_if + typename dtl::disable_if > BOOST_MOVE_I bool >::type) operator<=( BasicStringView x, const basic_string& y) { return !(y < x); } @@ -3233,7 +3233,7 @@ operator<=( BasicStringView x, const basic_string class BasicStringView> inline BOOST_CONTAINER_DOC1ST( bool, - typename container_detail::disable_if + typename dtl::disable_if > BOOST_MOVE_I bool >::type) operator<=( const basic_string& x, BasicStringView y) { return !(y < x); } @@ -3257,7 +3257,7 @@ operator>=(const basic_string& x, const CharT* s) template class BasicStringView> inline BOOST_CONTAINER_DOC1ST( bool, - typename container_detail::disable_if + typename dtl::disable_if > BOOST_MOVE_I bool >::type) operator>=( BasicStringView x, const basic_string& y) { return !(x < y); } @@ -3265,7 +3265,7 @@ operator>=( BasicStringView x, const basic_string class BasicStringView> inline BOOST_CONTAINER_DOC1ST( bool, - typename container_detail::disable_if + typename dtl::disable_if > BOOST_MOVE_I bool >::type) operator>=( const basic_string& x, BasicStringView y) { return !(x < y); } @@ -3277,7 +3277,7 @@ inline void swap(basic_string& x, basic_string inline bool @@ -3294,7 +3294,7 @@ string_fill(std::basic_ostream& os, return ok; } -} //namespace container_detail { +} //namespace dtl { #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED template @@ -3316,13 +3316,13 @@ operator<<(std::basic_ostream& os, const basic_stringsputn(s.data(), std::streamsize(n)) == std::streamsize(n); if (left) - ok = ok && container_detail::string_fill(os, buf, pad_len); + ok = ok && dtl::string_fill(os, buf, pad_len); } if (!ok) diff --git a/include/boost/container/uses_allocator.hpp b/include/boost/container/uses_allocator.hpp index 2bcc465..e0e3518 100644 --- a/include/boost/container/uses_allocator.hpp +++ b/include/boost/container/uses_allocator.hpp @@ -112,7 +112,7 @@ struct constructible_with_allocator_prefix #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED -namespace container_detail { +namespace dtl { template struct uses_allocator_imp @@ -130,8 +130,8 @@ struct uses_allocator_imp // Match this function if T::allocator_type exists and it's type is `erased_type`. template - static typename container_detail::enable_if - < container_detail::is_same + static typename dtl::enable_if + < dtl::is_same , yes_type >::type test(const V&); @@ -145,7 +145,7 @@ struct uses_allocator_imp static const bool value = sizeof(test(alloc)) == sizeof(yes_type); }; -} //namespace container_detail { +} //namespace dtl { #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED @@ -161,7 +161,7 @@ struct uses_allocator_imp //! is an alias `erased_type`. False otherwise. template struct uses_allocator - : container_detail::uses_allocator_imp + : dtl::uses_allocator_imp {}; }} //namespace boost::container diff --git a/include/boost/container/vector.hpp b/include/boost/container/vector.hpp index 8e1e7a5..0c33606 100644 --- a/include/boost/container/vector.hpp +++ b/include/boost/container/vector.hpp @@ -73,7 +73,7 @@ namespace container { #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED -namespace container_detail { +namespace dtl { template class vec_iterator @@ -244,17 +244,17 @@ struct vector_merge_cursor Comp &m_cmp; }; -} //namespace container_detail { +} //namespace dtl { template -BOOST_CONTAINER_FORCEINLINE const Pointer &vector_iterator_get_ptr(const container_detail::vec_iterator &it) BOOST_NOEXCEPT_OR_NOTHROW +BOOST_CONTAINER_FORCEINLINE const Pointer &vector_iterator_get_ptr(const dtl::vec_iterator &it) BOOST_NOEXCEPT_OR_NOTHROW { return it.get_ptr(); } template -BOOST_CONTAINER_FORCEINLINE Pointer &get_ptr(container_detail::vec_iterator &it) BOOST_NOEXCEPT_OR_NOTHROW +BOOST_CONTAINER_FORCEINLINE Pointer &get_ptr(dtl::vec_iterator &it) BOOST_NOEXCEPT_OR_NOTHROW { return it.get_ptr(); } -namespace container_detail { +namespace dtl { struct uninitialized_size_t {}; static const uninitialized_size_t uninitialized_size = uninitialized_size_t(); @@ -278,18 +278,18 @@ struct vector_value_traits typedef vector_value_traits_base base_t; //This is the anti-exception array destructor //to deallocate values already constructed - typedef typename container_detail::if_c + typedef typename dtl::if_c - ,container_detail::scoped_destructor_n + ,dtl::null_scoped_destructor_n + ,dtl::scoped_destructor_n >::type ArrayDestructor; //This is the anti-exception array deallocator - typedef container_detail::scoped_array_deallocator ArrayDeallocator; + typedef dtl::scoped_array_deallocator ArrayDeallocator; }; //!This struct deallocates and allocated memory template < class Allocator - , class AllocatorVersion = typename container_detail::version::type + , class AllocatorVersion = typename dtl::version::type > struct vector_alloc_holder : public Allocator @@ -322,7 +322,7 @@ struct vector_alloc_holder //Constructor, does not throw vector_alloc_holder() - BOOST_NOEXCEPT_IF(container_detail::is_nothrow_default_constructible::value) + BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible::value) : Allocator(), m_start(), m_size(), m_capacity() {} @@ -397,7 +397,7 @@ struct vector_alloc_holder } vector_alloc_holder(pointer p, size_type n) - BOOST_NOEXCEPT_IF(container_detail::is_nothrow_default_constructible::value) + BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible::value) : Allocator() , m_start(p) , m_size() @@ -422,7 +422,7 @@ struct vector_alloc_holder BOOST_CONTAINER_FORCEINLINE pointer allocation_command(boost::container::allocation_type command, size_type limit_size, size_type &prefer_in_recvd_out_size, pointer &reuse) { - typedef typename container_detail::version::type alloc_version; + typedef typename dtl::version::type alloc_version; return this->priv_allocation_command(alloc_version(), command, limit_size, prefer_in_recvd_out_size, reuse); } @@ -536,7 +536,7 @@ struct vector_alloc_holder //Constructor, does not throw vector_alloc_holder() - BOOST_NOEXCEPT_IF(container_detail::is_nothrow_default_constructible::value) + BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible::value) : Allocator(), m_size() {} @@ -649,7 +649,7 @@ struct vector_alloc_holder } }; -} //namespace container_detail { +} //namespace dtl { #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED @@ -672,16 +672,16 @@ class vector { return a < b; } }; - typedef typename container_detail::version::type alloc_version; - typedef boost::container::container_detail::vector_alloc_holder alloc_holder_t; + typedef typename dtl::version::type alloc_version; + typedef boost::container::dtl::vector_alloc_holder alloc_holder_t; alloc_holder_t m_holder; typedef allocator_traits allocator_traits_type; template friend class vector; typedef typename allocator_traits_type::pointer pointer_impl; - typedef container_detail::vec_iterator iterator_impl; - typedef container_detail::vec_iterator const_iterator_impl; + typedef dtl::vec_iterator iterator_impl; + typedef dtl::vec_iterator const_iterator_impl; protected: static bool is_propagable_from(const Allocator &from_alloc, pointer_impl p, const Allocator &to_alloc, bool const propagate_allocator) @@ -716,7 +716,7 @@ class vector #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED private: BOOST_COPYABLE_AND_MOVABLE(vector) - typedef container_detail::vector_value_traits value_traits; + typedef dtl::vector_value_traits value_traits; typedef constant_iterator cvalue_iterator; protected: @@ -748,7 +748,7 @@ class vector //! Throws: Nothing. //! //! Complexity: Constant. - vector() BOOST_NOEXCEPT_IF(container_detail::is_nothrow_default_constructible::value) + vector() BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible::value) : m_holder() {} @@ -768,7 +768,7 @@ class vector //! //! Complexity: Linear to n. explicit vector(size_type n) - : m_holder(container_detail::uninitialized_size, n) + : m_holder(dtl::uninitialized_size, n) { #ifdef BOOST_CONTAINER_VECTOR_ALLOC_STATS this->num_alloc += n != 0; @@ -785,7 +785,7 @@ class vector //! //! Complexity: Linear to n. explicit vector(size_type n, const allocator_type &a) - : m_holder(container_detail::uninitialized_size, a, n) + : m_holder(dtl::uninitialized_size, a, n) { #ifdef BOOST_CONTAINER_VECTOR_ALLOC_STATS this->num_alloc += n != 0; @@ -804,7 +804,7 @@ class vector //! //! Note: Non-standard extension vector(size_type n, default_init_t) - : m_holder(container_detail::uninitialized_size, n) + : m_holder(dtl::uninitialized_size, n) { #ifdef BOOST_CONTAINER_VECTOR_ALLOC_STATS this->num_alloc += n != 0; @@ -823,7 +823,7 @@ class vector //! //! Note: Non-standard extension vector(size_type n, default_init_t, const allocator_type &a) - : m_holder(container_detail::uninitialized_size, a, n) + : m_holder(dtl::uninitialized_size, a, n) { #ifdef BOOST_CONTAINER_VECTOR_ALLOC_STATS this->num_alloc += n != 0; @@ -840,7 +840,7 @@ class vector //! //! Complexity: Linear to n. vector(size_type n, const T& value) - : m_holder(container_detail::uninitialized_size, n) + : m_holder(dtl::uninitialized_size, n) { #ifdef BOOST_CONTAINER_VECTOR_ALLOC_STATS this->num_alloc += n != 0; @@ -857,7 +857,7 @@ class vector //! //! Complexity: Linear to n. vector(size_type n, const T& value, const allocator_type& a) - : m_holder(container_detail::uninitialized_size, a, n) + : m_holder(dtl::uninitialized_size, a, n) { #ifdef BOOST_CONTAINER_VECTOR_ALLOC_STATS this->num_alloc += n != 0; @@ -875,9 +875,9 @@ class vector //! Complexity: Linear to the range [first, last). template vector(InIt first, InIt last - BOOST_CONTAINER_DOCIGN(BOOST_MOVE_I typename container_detail::disable_if_c - < container_detail::is_convertible::value - BOOST_MOVE_I container_detail::nat >::type * = 0) + BOOST_CONTAINER_DOCIGN(BOOST_MOVE_I typename dtl::disable_if_c + < dtl::is_convertible::value + BOOST_MOVE_I dtl::nat >::type * = 0) ) : m_holder() { this->assign(first, last); } @@ -891,9 +891,9 @@ class vector //! Complexity: Linear to the range [first, last). template vector(InIt first, InIt last, const allocator_type& a - BOOST_CONTAINER_DOCIGN(BOOST_MOVE_I typename container_detail::disable_if_c - < container_detail::is_convertible::value - BOOST_MOVE_I container_detail::nat >::type * = 0) + BOOST_CONTAINER_DOCIGN(BOOST_MOVE_I typename dtl::disable_if_c + < dtl::is_convertible::value + BOOST_MOVE_I dtl::nat >::type * = 0) ) : m_holder(a) { this->assign(first, last); } @@ -907,7 +907,7 @@ class vector //! //! Complexity: Linear to the elements x contains. vector(const vector &x) - : m_holder( container_detail::uninitialized_size + : m_holder( dtl::uninitialized_size , allocator_traits_type::select_on_container_copy_construction(x.m_holder.alloc()) , x.size()) { @@ -953,8 +953,8 @@ class vector //! Note: Non-standard extension to support static_vector template vector(BOOST_RV_REF_BEG vector BOOST_RV_REF_END x - , typename container_detail::enable_if_c - < container_detail::is_version::value>::type * = 0 + , typename dtl::enable_if_c + < dtl::is_version::value>::type * = 0 ) : m_holder(boost::move(x.m_holder)) {} @@ -970,7 +970,7 @@ class vector //! //! Complexity: Linear to the elements x contains. vector(const vector &x, const allocator_type &a) - : m_holder(container_detail::uninitialized_size, a, x.size()) + : m_holder(dtl::uninitialized_size, a, x.size()) { #ifdef BOOST_CONTAINER_VECTOR_ALLOC_STATS this->num_alloc += x.size() != 0; @@ -988,7 +988,7 @@ class vector //! //! Complexity: Constant if a == x.get_allocator(), linear otherwise. vector(BOOST_RV_REF(vector) x, const allocator_type &a) - : m_holder( container_detail::uninitialized_size, a + : m_holder( dtl::uninitialized_size, a , is_propagable_from(x.get_stored_allocator(), x.m_holder.start(), a, true) ? 0 : x.size() ) { @@ -1079,10 +1079,10 @@ class vector //! //! Note: Non-standard extension to support static_vector template - BOOST_CONTAINER_FORCEINLINE typename container_detail::enable_if_and + BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_and < vector& - , container_detail::is_version - , container_detail::is_different + , dtl::is_version + , dtl::is_different >::type operator=(BOOST_RV_REF_BEG vector BOOST_RV_REF_END x) { @@ -1101,10 +1101,10 @@ class vector //! //! Note: Non-standard extension to support static_vector template - BOOST_CONTAINER_FORCEINLINE typename container_detail::enable_if_and + BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_and < vector& - , container_detail::is_version - , container_detail::is_different + , dtl::is_version + , dtl::is_different >::type operator=(const vector &x) { @@ -1122,12 +1122,12 @@ class vector //! Complexity: Linear to n. template void assign(InIt first, InIt last - BOOST_CONTAINER_DOCIGN(BOOST_MOVE_I typename container_detail::disable_if_or + BOOST_CONTAINER_DOCIGN(BOOST_MOVE_I typename dtl::disable_if_or < void - BOOST_MOVE_I container_detail::is_convertible - BOOST_MOVE_I container_detail::and_ - < container_detail::is_different - BOOST_MOVE_I container_detail::is_not_input_iterator + BOOST_MOVE_I dtl::is_convertible + BOOST_MOVE_I dtl::and_ + < dtl::is_different + BOOST_MOVE_I dtl::is_not_input_iterator > >::type * = 0) ) @@ -1171,11 +1171,11 @@ class vector //! Complexity: Linear to n. template void assign(FwdIt first, FwdIt last - BOOST_CONTAINER_DOCIGN(BOOST_MOVE_I typename container_detail::disable_if_or + BOOST_CONTAINER_DOCIGN(BOOST_MOVE_I typename dtl::disable_if_or < void - BOOST_MOVE_I container_detail::is_same - BOOST_MOVE_I container_detail::is_convertible - BOOST_MOVE_I container_detail::is_input_iterator + BOOST_MOVE_I dtl::is_same + BOOST_MOVE_I dtl::is_convertible + BOOST_MOVE_I dtl::is_input_iterator >::type * = 0) ) { @@ -1697,7 +1697,7 @@ class vector return *p; } else{ - typedef container_detail::insert_emplace_proxy type; + typedef dtl::insert_emplace_proxy type; return *this->priv_forward_range_insert_no_capacity (this->back_ptr(), 1, type(::boost::forward(args)...), alloc_version()); } @@ -1738,7 +1738,7 @@ class vector { BOOST_ASSERT(this->priv_in_range_or_end(position)); //Just call more general insert(pos, size, value) and return iterator - typedef container_detail::insert_emplace_proxy type; + typedef dtl::insert_emplace_proxy type; return this->priv_forward_range_insert( vector_iterator_get_ptr(position), 1 , type(::boost::forward(args)...)); } @@ -1757,7 +1757,7 @@ class vector return *p;\ }\ else{\ - typedef container_detail::insert_emplace_proxy_arg##N type;\ + typedef dtl::insert_emplace_proxy_arg##N type;\ return *this->priv_forward_range_insert_no_capacity\ ( this->back_ptr(), 1, type(BOOST_MOVE_FWD##N), alloc_version());\ }\ @@ -1779,7 +1779,7 @@ class vector iterator emplace(const_iterator pos BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\ {\ BOOST_ASSERT(this->priv_in_range_or_end(pos));\ - typedef container_detail::insert_emplace_proxy_arg##N type;\ + typedef dtl::insert_emplace_proxy_arg##N type;\ return this->priv_forward_range_insert(vector_iterator_get_ptr(pos), 1, type(BOOST_MOVE_FWD##N));\ }\ // @@ -1845,7 +1845,7 @@ class vector iterator insert(const_iterator p, size_type n, const T& x) { BOOST_ASSERT(this->priv_in_range_or_end(p)); - container_detail::insert_n_copies_proxy proxy(x); + dtl::insert_n_copies_proxy proxy(x); return this->priv_forward_range_insert(vector_iterator_get_ptr(p), n, proxy); } @@ -1862,10 +1862,10 @@ class vector template iterator insert(const_iterator pos, InIt first, InIt last #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) - , typename container_detail::disable_if_or + , typename dtl::disable_if_or < void - , container_detail::is_convertible - , container_detail::is_not_input_iterator + , dtl::is_convertible + , dtl::is_not_input_iterator >::type * = 0 #endif ) @@ -1883,15 +1883,15 @@ class vector #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED) template iterator insert(const_iterator pos, FwdIt first, FwdIt last - , typename container_detail::disable_if_or + , typename dtl::disable_if_or < void - , container_detail::is_convertible - , container_detail::is_input_iterator + , dtl::is_convertible + , dtl::is_input_iterator >::type * = 0 ) { BOOST_ASSERT(this->priv_in_range_or_end(pos)); - container_detail::insert_range_proxy proxy(first); + dtl::insert_range_proxy proxy(first); return this->priv_forward_range_insert(vector_iterator_get_ptr(pos), boost::container::iterator_distance(first, last), proxy); } #endif @@ -1916,10 +1916,10 @@ class vector iterator insert(const_iterator pos, size_type num, InIt first, InIt last) { BOOST_ASSERT(this->priv_in_range_or_end(pos)); - BOOST_ASSERT(container_detail::is_input_iterator::value || + BOOST_ASSERT(dtl::is_input_iterator::value || num == static_cast(boost::container::iterator_distance(first, last))); (void)last; - container_detail::insert_range_proxy proxy(first); + dtl::insert_range_proxy proxy(first); return this->priv_forward_range_insert(vector_iterator_get_ptr(pos), num, proxy); } #endif @@ -1997,9 +1997,9 @@ class vector void swap(vector& x) BOOST_NOEXCEPT_IF( ((allocator_traits_type::propagate_on_container_swap::value || allocator_traits_type::is_always_equal::value) && - !container_detail::is_version::value)) + !dtl::is_version::value)) { - this->priv_swap(x, container_detail::bool_::value>()); + this->priv_swap(x, dtl::bool_::value>()); } #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED @@ -2013,10 +2013,10 @@ class vector //! Note: Non-standard extension to support static_vector template void swap(vector & x - , typename container_detail::enable_if_and + , typename dtl::enable_if_and < void - , container_detail::is_version - , container_detail::is_different + , dtl::is_version + , dtl::is_different >::type * = 0 ) { this->m_holder.deep_swap(x.m_holder); } @@ -2101,7 +2101,7 @@ class vector template void insert_ordered_at(const size_type element_count, BiDirPosConstIt last_position_it, BiDirValueIt last_value_it) { - typedef container_detail::vector_insert_ordered_cursor inserter_t; + typedef dtl::vector_insert_ordered_cursor inserter_t; return this->priv_insert_ordered_at(element_count, inserter_t(last_position_it, last_value_it)); } @@ -2111,15 +2111,15 @@ class vector template void merge(BidirIt first, BidirIt last, Compare comp) - { this->priv_merge(container_detail::false_type(), first, last, comp); } + { this->priv_merge(dtl::false_type(), first, last, comp); } template void merge_unique(BidirIt first, BidirIt last) - { this->priv_merge(container_detail::true_type(), first, last, value_less()); } + { this->priv_merge(dtl::true_type(), first, last, value_less()); } template void merge_unique(BidirIt first, BidirIt last, Compare comp) - { this->priv_merge(container_detail::true_type(), first, last, comp); } + { this->priv_merge(dtl::true_type(), first, last, comp); } private: template @@ -2289,10 +2289,10 @@ class vector template void priv_move_assign(BOOST_RV_REF_BEG vector BOOST_RV_REF_END x - , typename container_detail::enable_if_c - < container_detail::is_version::value >::type * = 0) + , typename dtl::enable_if_c + < dtl::is_version::value >::type * = 0) { - if(!container_detail::is_same::value && + if(!dtl::is_same::value && this->capacity() < x.size()){ throw_bad_alloc(); } @@ -2306,10 +2306,10 @@ class vector template void priv_move_assign(BOOST_RV_REF_BEG vector BOOST_RV_REF_END x - , typename container_detail::disable_if_or + , typename dtl::disable_if_or < void - , container_detail::is_version - , container_detail::is_different + , dtl::is_version + , dtl::is_different >::type * = 0) { //for move assignment, no aliasing (&x != this) is assummed. @@ -2341,15 +2341,15 @@ class vector ); } //Move allocator if needed - container_detail::move_alloc(this_alloc, x_alloc, container_detail::bool_()); + dtl::move_alloc(this_alloc, x_alloc, dtl::bool_()); } template void priv_copy_assign(const vector &x - , typename container_detail::enable_if_c - < container_detail::is_version::value >::type * = 0) + , typename dtl::enable_if_c + < dtl::is_version::value >::type * = 0) { - if(!container_detail::is_same::value && + if(!dtl::is_same::value && this->capacity() < x.size()){ throw_bad_alloc(); } @@ -2362,31 +2362,31 @@ class vector } template - typename container_detail::disable_if_or + typename dtl::disable_if_or < void - , container_detail::is_version - , container_detail::is_different + , dtl::is_version + , dtl::is_different >::type priv_copy_assign(const vector &x) { allocator_type &this_alloc = this->m_holder.alloc(); const allocator_type &x_alloc = x.m_holder.alloc(); - container_detail::bool_ flag; if(flag && this_alloc != x_alloc){ this->clear(); this->shrink_to_fit(); } - container_detail::assign_alloc(this_alloc, x_alloc, flag); + dtl::assign_alloc(this_alloc, x_alloc, flag); this->assign( x.priv_raw_begin(), x.priv_raw_end() ); } template //Template it to avoid it in explicit instantiations - void priv_swap(Vector &x, container_detail::true_type) //version_0 + void priv_swap(Vector &x, dtl::true_type) //version_0 { this->m_holder.deep_swap(x.m_holder); } template //Template it to avoid it in explicit instantiations - void priv_swap(Vector &x, container_detail::false_type) //version_N + void priv_swap(Vector &x, dtl::false_type) //version_N { const bool propagate_alloc = allocator_traits_type::propagate_on_container_swap::value; if(are_swap_propagable( this->get_stored_allocator(), this->m_holder.start() @@ -2413,15 +2413,15 @@ class vector big.erase(big.nth(common_elements), big.cend()); } //And now swap the allocator - container_detail::swap_alloc(this->m_holder.alloc(), x.m_holder.alloc(), container_detail::bool_()); + dtl::swap_alloc(this->m_holder.alloc(), x.m_holder.alloc(), dtl::bool_()); } void priv_reserve_no_capacity(size_type, version_0) { throw_bad_alloc(); } - container_detail::insert_range_proxy, T*> priv_dummy_empty_proxy() + dtl::insert_range_proxy, T*> priv_dummy_empty_proxy() { - return container_detail::insert_range_proxy, T*> + return dtl::insert_range_proxy, T*> (::boost::make_move_iterator((T *)0)); } @@ -2512,14 +2512,14 @@ class vector { BOOST_ASSERT(this->priv_in_range_or_end(p)); return this->priv_forward_range_insert - ( vector_iterator_get_ptr(p), 1, container_detail::get_insert_value_proxy(::boost::forward(x))); + ( vector_iterator_get_ptr(p), 1, dtl::get_insert_value_proxy(::boost::forward(x))); } - container_detail::insert_copy_proxy priv_single_insert_proxy(const T &x) - { return container_detail::insert_copy_proxy (x); } + dtl::insert_copy_proxy priv_single_insert_proxy(const T &x) + { return dtl::insert_copy_proxy (x); } - container_detail::insert_move_proxy priv_single_insert_proxy(BOOST_RV_REF(T) x) - { return container_detail::insert_move_proxy (x); } + dtl::insert_move_proxy priv_single_insert_proxy(BOOST_RV_REF(T) x) + { return dtl::insert_move_proxy (x); } template void priv_push_back(BOOST_FWD_REF(U) u) @@ -2537,14 +2537,14 @@ class vector } } - container_detail::insert_n_copies_proxy priv_resize_proxy(const T &x) - { return container_detail::insert_n_copies_proxy(x); } + dtl::insert_n_copies_proxy priv_resize_proxy(const T &x) + { return dtl::insert_n_copies_proxy(x); } - container_detail::insert_default_initialized_n_proxy priv_resize_proxy(default_init_t) - { return container_detail::insert_default_initialized_n_proxy(); } + dtl::insert_default_initialized_n_proxy priv_resize_proxy(default_init_t) + { return dtl::insert_default_initialized_n_proxy(); } - container_detail::insert_value_initialized_n_proxy priv_resize_proxy(value_init_t) - { return container_detail::insert_value_initialized_n_proxy(); } + dtl::insert_value_initialized_n_proxy priv_resize_proxy(value_init_t) + { return dtl::insert_value_initialized_n_proxy(); } template void priv_resize(size_type new_size, const U& u) diff --git a/src/monotonic_buffer_resource.cpp b/src/monotonic_buffer_resource.cpp index 8e5cc89..ec6d976 100644 --- a/src/monotonic_buffer_resource.cpp +++ b/src/monotonic_buffer_resource.cpp @@ -80,7 +80,7 @@ monotonic_buffer_resource::monotonic_buffer_resource(void* buffer, std::size_t b , m_current_buffer_size(buffer_size) , m_next_buffer_size (bi::detail::previous_or_equal_pow2 - (boost::container::container_detail::max_value(buffer_size, std::size_t(initial_next_buffer_size)))) + (boost::container::dtl::max_value(buffer_size, std::size_t(initial_next_buffer_size)))) { this->increase_next_buffer(); } monotonic_buffer_resource::~monotonic_buffer_resource() diff --git a/src/pool_resource.cpp b/src/pool_resource.cpp index 45f1564..e6829e2 100644 --- a/src/pool_resource.cpp +++ b/src/pool_resource.cpp @@ -66,9 +66,9 @@ class pool_data_t void replenish(memory_resource &mr, std::size_t pool_block, std::size_t max_blocks_per_chunk) { //Limit max value - std::size_t blocks_per_chunk = boost::container::container_detail::min_value(max_blocks_per_chunk, next_blocks_per_chunk); + std::size_t blocks_per_chunk = boost::container::dtl::min_value(max_blocks_per_chunk, next_blocks_per_chunk); //Avoid overflow - blocks_per_chunk = boost::container::container_detail::min_value(blocks_per_chunk, std::size_t(-1)/pool_block); + blocks_per_chunk = boost::container::dtl::min_value(blocks_per_chunk, std::size_t(-1)/pool_block); //Minimum block size is at least max_align, so all pools allocate sizes that are multiple of max_align, //meaning that all blocks are max_align-aligned. @@ -108,7 +108,7 @@ void pool_resource::priv_limit_option(std::size_t &val, std::size_t min, std::si val = max; } else{ - val = val < min ? min : boost::container::container_detail::min_value(val, max); + val = val < min ? min : boost::container::dtl::min_value(val, max); } } @@ -116,7 +116,7 @@ std::size_t pool_resource::priv_pool_index(std::size_t block_size) //static { //For allocations equal or less than pool_options_minimum_largest_required_pool_block //the smallest pool is used - block_size = boost::container::container_detail::max_value(block_size, pool_options_minimum_largest_required_pool_block); + block_size = boost::container::dtl::max_value(block_size, pool_options_minimum_largest_required_pool_block); return bi::detail::ceil_log2(block_size) - bi::detail::ceil_log2(pool_options_minimum_largest_required_pool_block); } diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 55e2245..2b4995b 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -27,7 +27,7 @@ rule test_all for local fileb in [ glob *.cpp ] { - all_rules += [ run $(fileb) /boost/container//boost_container /boost/timer//boost_timer + all_rules += [ run $(fileb) /boost/container//boost_container : # additional args : # test-files : # requirements diff --git a/test/allocator_argument_tester.hpp b/test/allocator_argument_tester.hpp index 5050ff4..7399328 100644 --- a/test/allocator_argument_tester.hpp +++ b/test/allocator_argument_tester.hpp @@ -27,10 +27,10 @@ class propagation_test_allocator typedef propagation_test_allocator other; }; - typedef boost::container::container_detail::bool_ propagate_on_container_copy_assignment; - typedef boost::container::container_detail::bool_ propagate_on_container_move_assignment; - typedef boost::container::container_detail::bool_ propagate_on_container_swap; - typedef boost::container::container_detail::bool_ is_always_equal; + typedef boost::container::dtl::bool_ propagate_on_container_copy_assignment; + typedef boost::container::dtl::bool_ propagate_on_container_move_assignment; + typedef boost::container::dtl::bool_ propagate_on_container_swap; + typedef boost::container::dtl::bool_ is_always_equal; typedef T value_type; propagation_test_allocator() diff --git a/test/allocator_traits_test.cpp b/test/allocator_traits_test.cpp index 0885f0b..4014424 100644 --- a/test/allocator_traits_test.cpp +++ b/test/allocator_traits_test.cpp @@ -27,7 +27,7 @@ class SimpleAllocator bool allocate_called_; bool deallocate_called_; - typedef boost::container::container_detail:: + typedef boost::container::dtl:: true_type is_always_equal; typedef T value_type; @@ -106,20 +106,20 @@ class ComplexAllocator typedef SimpleSmartPtr pointer; typedef SimpleSmartPtr const_pointer; typedef typename ::boost::container:: - container_detail::unvoid_ref::type reference; + dtl::unvoid_ref::type reference; typedef typename ::boost::container:: - container_detail::unvoid_ref::type const_reference; + dtl::unvoid_ref::type const_reference; typedef SimpleSmartPtr void_pointer; typedef SimpleSmartPtr const_void_pointer; typedef signed short difference_type; typedef unsigned short size_type; - typedef boost::container::container_detail:: + typedef boost::container::dtl:: true_type propagate_on_container_copy_assignment; - typedef boost::container::container_detail:: + typedef boost::container::dtl:: true_type propagate_on_container_move_assignment; - typedef boost::container::container_detail:: + typedef boost::container::dtl:: true_type propagate_on_container_swap; - typedef boost::container::container_detail:: + typedef boost::container::dtl:: true_type is_partially_propagable; ComplexAllocator() @@ -247,7 +247,7 @@ void test_void_allocator() int main() { - using namespace boost::container::container_detail; + using namespace boost::container::dtl; test_void_allocator(); //SimpleAllocator diff --git a/test/check_equal_containers.hpp b/test/check_equal_containers.hpp index 86d9fb2..617089d 100644 --- a/test/check_equal_containers.hpp +++ b/test/check_equal_containers.hpp @@ -25,9 +25,9 @@ namespace test{ template< class T1, class T2> bool CheckEqual( const T1 &t1, const T2 &t2 - , typename boost::container::container_detail::enable_if_c - ::value && - !boost::container::container_detail::is_pair::value + , typename boost::container::dtl::enable_if_c + ::value && + !boost::container::dtl::is_pair::value >::type* = 0) { return t1 == t2; } @@ -50,9 +50,9 @@ bool CheckEqualIt( const T1 &i1, const T2 &i2, const C1 &c1, const C2 &c2 ) template< class Pair1, class Pair2> bool CheckEqual( const Pair1 &pair1, const Pair2 &pair2 - , typename boost::container::container_detail::enable_if_c - ::value && - boost::container::container_detail::is_pair::value + , typename boost::container::dtl::enable_if_c + ::value && + boost::container::dtl::is_pair::value >::type* = 0) { return CheckEqual(pair1.first, pair2.first) && CheckEqual(pair1.second, pair2.second); diff --git a/test/deque_test.cpp b/test/deque_test.cpp index 9ed8cf8..bb9e162 100644 --- a/test/deque_test.cpp +++ b/test/deque_test.cpp @@ -51,14 +51,14 @@ template class boost::container::deque //Function to check if both sets are equal template -bool deque_copyable_only(V1 &, V2 &, container_detail::false_type) +bool deque_copyable_only(V1 &, V2 &, dtl::false_type) { return true; } //Function to check if both sets are equal template -bool deque_copyable_only(V1 &cntdeque, V2 &stddeque, container_detail::true_type) +bool deque_copyable_only(V1 &cntdeque, V2 &stddeque, dtl::true_type) { typedef typename V1::value_type IntType; std::size_t size = cntdeque.size(); @@ -246,7 +246,7 @@ bool do_test() } if(!deque_copyable_only(cntdeque, stddeque - ,container_detail::bool_::value>())){ + ,dtl::bool_::value>())){ return false; } diff --git a/test/dummy_test_allocator.hpp b/test/dummy_test_allocator.hpp index 7576d45..024ab0e 100644 --- a/test/dummy_test_allocator.hpp +++ b/test/dummy_test_allocator.hpp @@ -85,11 +85,11 @@ class propagation_test_allocator public: typedef T value_type; - typedef boost::container::container_detail::bool_ + typedef boost::container::dtl::bool_ propagate_on_container_copy_assignment; - typedef boost::container::container_detail::bool_ + typedef boost::container::dtl::bool_ propagate_on_container_move_assignment; - typedef boost::container::container_detail::bool_ + typedef boost::container::dtl::bool_ propagate_on_container_swap; template diff --git a/test/emplace_test.hpp b/test/emplace_test.hpp index 89f4255..cd8147b 100644 --- a/test/emplace_test.hpp +++ b/test/emplace_test.hpp @@ -144,7 +144,7 @@ bool test_expected_container(const Container &ec, const std::pair EmplaceIntPair; -static boost::container::container_detail::aligned_storage::type pair_storage; +static boost::container::dtl::aligned_storage::type pair_storage; static EmplaceIntPair* initialize_emplace_int_pair() { @@ -160,7 +160,7 @@ static EmplaceIntPair * expected_pair = initialize_emplace_int_pair(); template -bool test_emplace_back(container_detail::true_) +bool test_emplace_back(dtl::true_) { std::cout << "Starting test_emplace_back." << std::endl << " Class: " << typeid(Container).name() << std::endl; @@ -209,11 +209,11 @@ bool test_emplace_back(container_detail::true_) } template -bool test_emplace_back(container_detail::false_) +bool test_emplace_back(dtl::false_) { return true; } template -bool test_emplace_front(container_detail::true_) +bool test_emplace_front(dtl::true_) { std::cout << "Starting test_emplace_front." << std::endl << " Class: " << typeid(Container).name() << std::endl; @@ -261,11 +261,11 @@ bool test_emplace_front(container_detail::true_) } template -bool test_emplace_front(container_detail::false_) +bool test_emplace_front(dtl::false_) { return true; } template -bool test_emplace_before(container_detail::true_) +bool test_emplace_before(dtl::true_) { std::cout << "Starting test_emplace_before." << std::endl << " Class: " << typeid(Container).name() << std::endl; @@ -373,11 +373,11 @@ bool test_emplace_before(container_detail::true_) } template -bool test_emplace_before(container_detail::false_) +bool test_emplace_before(dtl::false_) { return true; } template -bool test_emplace_after(container_detail::true_) +bool test_emplace_after(dtl::true_) { std::cout << "Starting test_emplace_after." << std::endl << " Class: " << typeid(Container).name() << std::endl; @@ -459,11 +459,11 @@ bool test_emplace_after(container_detail::true_) } template -bool test_emplace_after(container_detail::false_) +bool test_emplace_after(dtl::false_) { return true; } template -bool test_emplace_assoc(container_detail::true_) +bool test_emplace_assoc(dtl::true_) { std::cout << "Starting test_emplace_assoc." << std::endl << " Class: " << typeid(Container).name() << std::endl; @@ -506,11 +506,11 @@ bool test_emplace_assoc(container_detail::true_) } template -bool test_emplace_assoc(container_detail::false_) +bool test_emplace_assoc(dtl::false_) { return true; } template -bool test_emplace_hint(container_detail::true_) +bool test_emplace_hint(dtl::true_) { std::cout << "Starting test_emplace_hint." << std::endl << " Class: " << typeid(Container).name() << std::endl; @@ -556,11 +556,11 @@ bool test_emplace_hint(container_detail::true_) } template -bool test_emplace_hint(container_detail::false_) +bool test_emplace_hint(dtl::false_) { return true; } template -bool test_emplace_assoc_pair(container_detail::true_) +bool test_emplace_assoc_pair(dtl::true_) { std::cout << "Starting test_emplace_assoc_pair." << std::endl << " Class: " << typeid(Container).name() << std::endl; @@ -594,11 +594,11 @@ bool test_emplace_assoc_pair(container_detail::true_) } template -bool test_emplace_assoc_pair(container_detail::false_) +bool test_emplace_assoc_pair(dtl::false_) { return true; } template -bool test_emplace_hint_pair(container_detail::true_) +bool test_emplace_hint_pair(dtl::true_) { std::cout << "Starting test_emplace_hint_pair." << std::endl << " Class: " << typeid(Container).name() << std::endl; @@ -633,14 +633,14 @@ bool test_emplace_hint_pair(container_detail::true_) } template -bool test_emplace_hint_pair(container_detail::false_) +bool test_emplace_hint_pair(dtl::false_) { return true; } template struct emplace_active { static const bool value = (0 != (O & Mask)); - typedef container_detail::bool_ type; + typedef dtl::bool_ type; operator type() const{ return type(); } }; diff --git a/test/expand_bwd_test_allocator.hpp b/test/expand_bwd_test_allocator.hpp index 2e16093..3a5bb6c 100644 --- a/test/expand_bwd_test_allocator.hpp +++ b/test/expand_bwd_test_allocator.hpp @@ -62,14 +62,14 @@ class expand_bwd_test_allocator typedef T value_type; typedef T * pointer; typedef const T * const_pointer; - typedef typename container_detail::add_reference + typedef typename dtl::add_reference ::type reference; - typedef typename container_detail::add_reference + typedef typename dtl::add_reference ::type const_reference; typedef std::size_t size_type; typedef std::ptrdiff_t difference_type; - typedef boost::container::container_detail::version_type version; + typedef boost::container::dtl::version_type version; //Dummy multiallocation chain struct multiallocation_chain{}; @@ -95,10 +95,10 @@ class expand_bwd_test_allocator , m_offset(other.m_offset), m_allocations(0){ } pointer address(reference value) - { return pointer(container_detail::addressof(value)); } + { return pointer(dtl::addressof(value)); } const_pointer address(const_reference value) const - { return const_pointer(container_detail::addressof(value)); } + { return const_pointer(dtl::addressof(value)); } pointer allocate(size_type , cvoid_ptr hint = 0) { (void)hint; return 0; } diff --git a/test/flat_map_test.cpp b/test/flat_map_test.cpp index ca0a3a1..bb6326a 100644 --- a/test/flat_map_test.cpp +++ b/test/flat_map_test.cpp @@ -370,13 +370,13 @@ struct GetMapContainer typedef flat_map< ValueType , ValueType , std::less - , typename boost::container::container_detail::container_or_allocator_rebind::type + , typename boost::container::dtl::container_or_allocator_rebind::type > map_type; typedef flat_multimap< ValueType , ValueType , std::less - , typename boost::container::container_detail::container_or_allocator_rebind::type + , typename boost::container::dtl::container_or_allocator_rebind::type > multimap_type; }; }; diff --git a/test/flat_set_test.cpp b/test/flat_set_test.cpp index a092a74..4c02643 100644 --- a/test/flat_set_test.cpp +++ b/test/flat_set_test.cpp @@ -441,12 +441,12 @@ struct GetSetContainer { typedef flat_set < ValueType , std::less - , typename boost::container::container_detail::container_or_allocator_rebind::type + , typename boost::container::dtl::container_or_allocator_rebind::type > set_type; typedef flat_multiset < ValueType , std::less - , typename boost::container::container_detail::container_or_allocator_rebind::type + , typename boost::container::dtl::container_or_allocator_rebind::type > multiset_type; }; }; diff --git a/test/flat_tree_test.cpp b/test/flat_tree_test.cpp index a8c944a..b70fb4a 100644 --- a/test/flat_tree_test.cpp +++ b/test/flat_tree_test.cpp @@ -17,14 +17,14 @@ using namespace boost::container; -typedef boost::container::container_detail::pair pair_t; +typedef boost::container::dtl::pair pair_t; namespace boost { namespace container { //Explicit instantiation to detect compilation errors -namespace container_detail { +namespace dtl { template class flat_tree < pair_t @@ -89,7 +89,7 @@ template class flat_tree , static_vector >; -} //container_detail { +} //dtl { }} //boost::container #if (__cplusplus > 201103L) @@ -97,7 +97,7 @@ template class flat_tree namespace boost{ namespace container{ -namespace container_detail{ +namespace dtl{ template class flat_tree < test::movable_and_copyable_int @@ -113,7 +113,7 @@ template class flat_tree , std::vector >; -} //container_detail { +} //dtl { }} //boost::container #endif diff --git a/test/list_test.cpp b/test/list_test.cpp index 065fa28..aa56b09 100644 --- a/test/list_test.cpp +++ b/test/list_test.cpp @@ -34,7 +34,7 @@ template class boost::container::list < test::movable_and_copyable_int , adaptive_pool >; -namespace container_detail { +namespace dtl { template class iterator_from_iiterator >::container_type::iterator, true >; diff --git a/test/list_test.hpp b/test/list_test.hpp index aec82c6..9640ec0 100644 --- a/test/list_test.hpp +++ b/test/list_test.hpp @@ -28,14 +28,14 @@ namespace container { namespace test{ template -bool list_copyable_only(V1 &, V2 &, boost::container::container_detail::false_type) +bool list_copyable_only(V1 &, V2 &, boost::container::dtl::false_type) { return true; } //Function to check if both sets are equal template -bool list_copyable_only(V1 &boostlist, V2 &stdlist, boost::container::container_detail::true_type) +bool list_copyable_only(V1 &boostlist, V2 &stdlist, boost::container::dtl::true_type) { typedef typename V1::value_type IntType; boostlist.insert(boostlist.end(), 50, IntType(1)); @@ -403,7 +403,7 @@ int list_test (bool copied_allocators_equal = true) } if(!list_copyable_only(boostlist, stdlist - ,container_detail::bool_::value>())){ + ,dtl::bool_::value>())){ return 1; } } diff --git a/test/map_test.hpp b/test/map_test.hpp index 01dd4c4..93dbf2f 100644 --- a/test/map_test.hpp +++ b/test/map_test.hpp @@ -42,11 +42,11 @@ namespace container { namespace test{ template -void map_test_rebalanceable(C &, boost::container::container_detail::false_type) +void map_test_rebalanceable(C &, boost::container::dtl::false_type) {} template -void map_test_rebalanceable(C &c, boost::container::container_detail::true_type) +void map_test_rebalanceable(C &c, boost::container::dtl::true_type) { c.rebalance(); } @@ -55,17 +55,17 @@ template -int map_test_copyable(boost::container::container_detail::false_type) +int map_test_copyable(boost::container::dtl::false_type) { return 0; } template -int map_test_copyable(boost::container::container_detail::true_type) +int map_test_copyable(boost::container::dtl::true_type) { typedef typename MyBoostMap::key_type IntType; - typedef container_detail::pair IntPairType; + typedef dtl::pair IntPairType; typedef typename MyStdMap::value_type StdPairType; const int MaxElem = 50; @@ -136,7 +136,7 @@ template IntPairType; + typedef dtl::pair IntPairType; typedef typename MyStdMap::value_type StdPairType; const int MaxElem = 50; typedef typename MyStdMap::value_type StdValueType; @@ -615,13 +615,13 @@ int map_test() return 1; map_test_rebalanceable(boostmap - , container_detail::bool_::value>()); + , dtl::bool_::value>()); if(!CheckEqualContainers(boostmap, stdmap)){ std::cout << "Error in boostmap.rebalance()" << std::endl; return 1; } map_test_rebalanceable(boostmultimap - , container_detail::bool_::value>()); + , dtl::bool_::value>()); if(!CheckEqualContainers(boostmultimap, stdmultimap)){ std::cout << "Error in boostmultimap.rebalance()" << std::endl; return 1; @@ -898,7 +898,7 @@ int map_test() } if(map_test_copyable - (container_detail::bool_::value>())){ + (dtl::bool_::value>())){ return 1; } return 0; diff --git a/test/node_handle_test.cpp b/test/node_handle_test.cpp index 94ce2ed..3c26379 100644 --- a/test/node_handle_test.cpp +++ b/test/node_handle_test.cpp @@ -174,16 +174,16 @@ typedef allocator_traits::portable_rebind_alloc::type v void test_types() { //set - BOOST_STATIC_ASSERT(( container_detail::is_same::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same::value )); + BOOST_STATIC_ASSERT(( dtl::is_same::value )); + BOOST_STATIC_ASSERT(( dtl::is_same::value )); + BOOST_STATIC_ASSERT(( dtl::is_same::value )); + BOOST_STATIC_ASSERT(( dtl::is_same::value )); //map - BOOST_STATIC_ASSERT(( container_detail::is_same::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same::value )); + BOOST_STATIC_ASSERT(( dtl::is_same::value )); + BOOST_STATIC_ASSERT(( dtl::is_same::value )); + BOOST_STATIC_ASSERT(( dtl::is_same::value )); + BOOST_STATIC_ASSERT(( dtl::is_same::value )); } void test_default_constructor() diff --git a/test/null_iterators_test.cpp b/test/null_iterators_test.cpp index faf60be..f081dbe 100644 --- a/test/null_iterators_test.cpp +++ b/test/null_iterators_test.cpp @@ -28,7 +28,7 @@ using namespace boost::container; -typedef boost::container::container_detail::aligned_storage::type buffer_t; +typedef boost::container::dtl::aligned_storage::type buffer_t; static buffer_t buffer_0x00; static buffer_t buffer_0xFF; diff --git a/test/pair_test.cpp b/test/pair_test.cpp index a8f4b0a..fcab0fb 100644 --- a/test/pair_test.cpp +++ b/test/pair_test.cpp @@ -36,50 +36,50 @@ using namespace ::boost::container; int main () { { - container_detail::pair p1; - container_detail::pair p2; - container_detail::pair p3; - container_detail::pair p4; + dtl::pair p1; + dtl::pair p2; + dtl::pair p3; + dtl::pair p4; } { //Constructible from two values - container_detail::pair p1(1, 2); - container_detail::pair p2(1, 2); - container_detail::pair p3(1, 2); - container_detail::pair p4(1, 2); + dtl::pair p1(1, 2); + dtl::pair p2(1, 2); + dtl::pair p3(1, 2); + dtl::pair p4(1, 2); } { //Constructible from internal types - container_detail::pair p2(test::copyable_int(1), test::copyable_int(2)); + dtl::pair p2(test::copyable_int(1), test::copyable_int(2)); { test::movable_int a(1), b(2); - container_detail::pair p3(::boost::move(a), ::boost::move(b)); + dtl::pair p3(::boost::move(a), ::boost::move(b)); } { test::movable_and_copyable_int a(1), b(2); - container_detail::pair p4(::boost::move(a), ::boost::move(b)); + dtl::pair p4(::boost::move(a), ::boost::move(b)); } } { //piecewise construct from boost tuple using namespace boost::tuples; { - boost::container::container_detail::pair p(piecewise_construct, tuple<>(), tuple<>()); + boost::container::dtl::pair p(piecewise_construct, tuple<>(), tuple<>()); BOOST_TEST(p.first == 0); BOOST_TEST(p.second == 0.f); } { - boost::container::container_detail::pair p(piecewise_construct, tuple<>(), tuple(2.f)); + boost::container::dtl::pair p(piecewise_construct, tuple<>(), tuple(2.f)); BOOST_TEST(p.first == 0); BOOST_TEST(p.second == 2.f); } { - boost::container::container_detail::pair p(piecewise_construct, tuple(2), tuple(1.f)); + boost::container::dtl::pair p(piecewise_construct, tuple(2), tuple(1.f)); BOOST_TEST(p.first == 2); BOOST_TEST(p.second == 1.f); } { - boost::container::container_detail::pair - < boost::container::container_detail::pair - , boost::container::container_detail::pair + boost::container::dtl::pair + < boost::container::dtl::pair + , boost::container::dtl::pair > p(piecewise_construct, tuple(3, 4.f), tuple(8.,'a')); BOOST_TEST(p.first.first == 3); BOOST_TEST(p.first.second == 4.f); @@ -87,7 +87,7 @@ int main () BOOST_TEST(p.second.second == 'a'); } { - boost::container::container_detail::pair + boost::container::dtl::pair < tuple , char > p(piecewise_construct, tuple(3, 16.f, 32.), tuple('b')); @@ -101,24 +101,24 @@ int main () { //piecewise construct from std tuple using std::tuple; { - boost::container::container_detail::pair p(piecewise_construct, tuple<>(), tuple<>()); + boost::container::dtl::pair p(piecewise_construct, tuple<>(), tuple<>()); BOOST_TEST(p.first == 0); BOOST_TEST(p.second == 0.f); } { - boost::container::container_detail::pair p(piecewise_construct, tuple<>(), tuple(2.f)); + boost::container::dtl::pair p(piecewise_construct, tuple<>(), tuple(2.f)); BOOST_TEST(p.first == 0); BOOST_TEST(p.second == 2.f); } { - boost::container::container_detail::pair p(piecewise_construct, tuple(2), tuple(1.f)); + boost::container::dtl::pair p(piecewise_construct, tuple(2), tuple(1.f)); BOOST_TEST(p.first == 2); BOOST_TEST(p.second == 1.f); } { - boost::container::container_detail::pair - < boost::container::container_detail::pair - , boost::container::container_detail::pair + boost::container::dtl::pair + < boost::container::dtl::pair + , boost::container::dtl::pair > p(piecewise_construct, tuple(3, 4.f), tuple(8.,'a')); BOOST_TEST(p.first.first == 3); BOOST_TEST(p.first.second == 4.f); @@ -126,7 +126,7 @@ int main () BOOST_TEST(p.second.second == 'a'); } { - boost::container::container_detail::pair + boost::container::dtl::pair < tuple , char > p(piecewise_construct, tuple(3, 16.f, 32.), tuple('b')); @@ -136,12 +136,12 @@ int main () BOOST_TEST(p.second == 'b'); } #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) - typedef container_detail::pair movable_pair_t; - typedef container_detail::pair movable_pair_pair_t; + typedef dtl::pair movable_pair_t; + typedef dtl::pair movable_pair_pair_t; test::movable_int a(1), b(2), c(3), d(4); movable_pair_pair_t p( piecewise_construct - , container_detail::forward_as_tuple(boost::move(a), boost::move(b)) - , container_detail::forward_as_tuple(boost::move(c), boost::move(d)) + , dtl::forward_as_tuple(boost::move(a), boost::move(b)) + , dtl::forward_as_tuple(boost::move(c), boost::move(d)) ); BOOST_TEST(p.first.first == 1); BOOST_TEST(p.first.second == 2); diff --git a/test/pmr_deque_test.cpp b/test/pmr_deque_test.cpp index 1b1a4bd..15c67e2 100644 --- a/test/pmr_deque_test.cpp +++ b/test/pmr_deque_test.cpp @@ -15,7 +15,7 @@ int main() { using namespace boost::container; - using boost::container::container_detail::is_same; + using boost::container::dtl::is_same; typedef deque > intcontainer_t; BOOST_STATIC_ASSERT(( is_same::type >::value )); diff --git a/test/pmr_flat_map_test.cpp b/test/pmr_flat_map_test.cpp index 2969db2..f98e497 100644 --- a/test/pmr_flat_map_test.cpp +++ b/test/pmr_flat_map_test.cpp @@ -15,7 +15,7 @@ int main() { using namespace boost::container; - using boost::container::container_detail::is_same; + using boost::container::dtl::is_same; typedef flat_map, pmr::polymorphic_allocator > > intcontainer_t; BOOST_STATIC_ASSERT(( is_same::type >::value )); diff --git a/test/pmr_flat_set_test.cpp b/test/pmr_flat_set_test.cpp index 55cd5b3..5c9efe1 100644 --- a/test/pmr_flat_set_test.cpp +++ b/test/pmr_flat_set_test.cpp @@ -15,7 +15,7 @@ int main() { using namespace boost::container; - using boost::container::container_detail::is_same; + using boost::container::dtl::is_same; typedef flat_set, pmr::polymorphic_allocator > intcontainer_t; BOOST_STATIC_ASSERT(( is_same::type >::value )); diff --git a/test/pmr_list_test.cpp b/test/pmr_list_test.cpp index 8b3bd22..794ccf5 100644 --- a/test/pmr_list_test.cpp +++ b/test/pmr_list_test.cpp @@ -15,7 +15,7 @@ int main() { using namespace boost::container; - using boost::container::container_detail::is_same; + using boost::container::dtl::is_same; typedef list > intcontainer_t; BOOST_STATIC_ASSERT(( is_same::type >::value )); diff --git a/test/pmr_map_test.cpp b/test/pmr_map_test.cpp index d50c10f..5db3f10 100644 --- a/test/pmr_map_test.cpp +++ b/test/pmr_map_test.cpp @@ -15,7 +15,7 @@ int main() { using namespace boost::container; - using boost::container::container_detail::is_same; + using boost::container::dtl::is_same; typedef map, pmr::polymorphic_allocator > > intcontainer_t; BOOST_STATIC_ASSERT(( is_same::type >::value )); diff --git a/test/pmr_set_test.cpp b/test/pmr_set_test.cpp index 6788eb5..3093fd4 100644 --- a/test/pmr_set_test.cpp +++ b/test/pmr_set_test.cpp @@ -15,7 +15,7 @@ int main() { using namespace boost::container; - using boost::container::container_detail::is_same; + using boost::container::dtl::is_same; typedef set, pmr::polymorphic_allocator > intcontainer_t; BOOST_STATIC_ASSERT(( is_same::type >::value )); diff --git a/test/pmr_small_vector_test.cpp b/test/pmr_small_vector_test.cpp index cc6a0bd..334588d 100644 --- a/test/pmr_small_vector_test.cpp +++ b/test/pmr_small_vector_test.cpp @@ -15,7 +15,7 @@ int main() { using namespace boost::container; - using boost::container::container_detail::is_same; + using boost::container::dtl::is_same; typedef small_vector > intcontainer_t; BOOST_STATIC_ASSERT(( is_same::type >::value )); diff --git a/test/pmr_stable_vector_test.cpp b/test/pmr_stable_vector_test.cpp index d0a280f..246f071 100644 --- a/test/pmr_stable_vector_test.cpp +++ b/test/pmr_stable_vector_test.cpp @@ -15,7 +15,7 @@ int main() { using namespace boost::container; - using boost::container::container_detail::is_same; + using boost::container::dtl::is_same; typedef stable_vector > intcontainer_t; BOOST_STATIC_ASSERT(( is_same::type >::value )); diff --git a/test/pmr_string_test.cpp b/test/pmr_string_test.cpp index 628865f..c8d81a5 100644 --- a/test/pmr_string_test.cpp +++ b/test/pmr_string_test.cpp @@ -15,7 +15,7 @@ int main() { using namespace boost::container; - using boost::container::container_detail::is_same; + using boost::container::dtl::is_same; typedef basic_string, pmr::polymorphic_allocator > string_t; typedef basic_string, pmr::polymorphic_allocator > wstring_t; diff --git a/test/pmr_vector_test.cpp b/test/pmr_vector_test.cpp index df0cac1..293291c 100644 --- a/test/pmr_vector_test.cpp +++ b/test/pmr_vector_test.cpp @@ -15,7 +15,7 @@ int main() { using namespace boost::container; - using boost::container::container_detail::is_same; + using boost::container::dtl::is_same; typedef vector > intcontainer_t; BOOST_STATIC_ASSERT(( is_same::type >::value )); diff --git a/test/polymorphic_allocator_test.cpp b/test/polymorphic_allocator_test.cpp index 449b706..10899ca 100644 --- a/test/polymorphic_allocator_test.cpp +++ b/test/polymorphic_allocator_test.cpp @@ -63,7 +63,7 @@ void test_allocate() BOOST_TEST(d.do_allocate_return == &dummy); //It shall allocate 2*sizeof(int), alignment_of BOOST_TEST(d.do_allocate_bytes == 2*sizeof(int)); - BOOST_TEST(d.do_allocate_alignment == container_detail::alignment_of::value); + BOOST_TEST(d.do_allocate_alignment == dtl::alignment_of::value); } void test_deallocate() @@ -77,7 +77,7 @@ void test_deallocate() //It shall deallocate 2*sizeof(int), alignment_of BOOST_TEST(d.do_deallocate_p == &dummy); BOOST_TEST(d.do_deallocate_bytes == 3*sizeof(int)); - BOOST_TEST(d.do_deallocate_alignment == container_detail::alignment_of::value); + BOOST_TEST(d.do_deallocate_alignment == dtl::alignment_of::value); } void test_construct() diff --git a/test/propagation_test_allocator.hpp b/test/propagation_test_allocator.hpp index ca6d8e5..7c8643c 100644 --- a/test/propagation_test_allocator.hpp +++ b/test/propagation_test_allocator.hpp @@ -29,10 +29,10 @@ class propagation_test_allocator typedef propagation_test_allocator other; }; - typedef boost::container::container_detail::bool_ propagate_on_container_copy_assignment; - typedef boost::container::container_detail::bool_ propagate_on_container_move_assignment; - typedef boost::container::container_detail::bool_ propagate_on_container_swap; - typedef boost::container::container_detail::bool_ is_always_equal; + typedef boost::container::dtl::bool_ propagate_on_container_copy_assignment; + typedef boost::container::dtl::bool_ propagate_on_container_move_assignment; + typedef boost::container::dtl::bool_ propagate_on_container_swap; + typedef boost::container::dtl::bool_ is_always_equal; typedef T value_type; propagation_test_allocator() diff --git a/test/scoped_allocator_adaptor_test.cpp b/test/scoped_allocator_adaptor_test.cpp index 51d6ee1..6a051e2 100644 --- a/test/scoped_allocator_adaptor_test.cpp +++ b/test/scoped_allocator_adaptor_test.cpp @@ -98,81 +98,81 @@ int main() , InnerAlloc2 > Rebound9Scoped2Inner; //outer_allocator_type - BOOST_STATIC_ASSERT(( container_detail::is_same< OuterAlloc + BOOST_STATIC_ASSERT(( dtl::is_same< OuterAlloc , Scoped0Inner::outer_allocator_type>::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same< OuterAlloc + BOOST_STATIC_ASSERT(( dtl::is_same< OuterAlloc , Scoped1Inner::outer_allocator_type>::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same< OuterAlloc + BOOST_STATIC_ASSERT(( dtl::is_same< OuterAlloc , Scoped2Inner::outer_allocator_type>::value )); //value_type - BOOST_STATIC_ASSERT(( container_detail::is_same< allocator_traits::value_type + BOOST_STATIC_ASSERT(( dtl::is_same< allocator_traits::value_type , Scoped0Inner::value_type>::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same< allocator_traits::value_type + BOOST_STATIC_ASSERT(( dtl::is_same< allocator_traits::value_type , Scoped1Inner::value_type>::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same< allocator_traits::value_type + BOOST_STATIC_ASSERT(( dtl::is_same< allocator_traits::value_type , Scoped2Inner::value_type>::value )); //size_type - BOOST_STATIC_ASSERT(( container_detail::is_same< allocator_traits::size_type + BOOST_STATIC_ASSERT(( dtl::is_same< allocator_traits::size_type , Scoped0Inner::size_type>::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same< allocator_traits::size_type + BOOST_STATIC_ASSERT(( dtl::is_same< allocator_traits::size_type , Scoped1Inner::size_type>::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same< allocator_traits::size_type + BOOST_STATIC_ASSERT(( dtl::is_same< allocator_traits::size_type , Scoped2Inner::size_type>::value )); //difference_type - BOOST_STATIC_ASSERT(( container_detail::is_same< allocator_traits::difference_type + BOOST_STATIC_ASSERT(( dtl::is_same< allocator_traits::difference_type , Scoped0Inner::difference_type>::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same< allocator_traits::difference_type + BOOST_STATIC_ASSERT(( dtl::is_same< allocator_traits::difference_type , Scoped1Inner::difference_type>::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same< allocator_traits::difference_type + BOOST_STATIC_ASSERT(( dtl::is_same< allocator_traits::difference_type , Scoped2Inner::difference_type>::value )); //pointer - BOOST_STATIC_ASSERT(( container_detail::is_same< allocator_traits::pointer + BOOST_STATIC_ASSERT(( dtl::is_same< allocator_traits::pointer , Scoped0Inner::pointer>::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same< allocator_traits::pointer + BOOST_STATIC_ASSERT(( dtl::is_same< allocator_traits::pointer , Scoped1Inner::pointer>::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same< allocator_traits::pointer + BOOST_STATIC_ASSERT(( dtl::is_same< allocator_traits::pointer , Scoped2Inner::pointer>::value )); //const_pointer - BOOST_STATIC_ASSERT(( container_detail::is_same< allocator_traits::const_pointer + BOOST_STATIC_ASSERT(( dtl::is_same< allocator_traits::const_pointer , Scoped0Inner::const_pointer>::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same< allocator_traits::const_pointer + BOOST_STATIC_ASSERT(( dtl::is_same< allocator_traits::const_pointer , Scoped1Inner::const_pointer>::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same< allocator_traits::const_pointer + BOOST_STATIC_ASSERT(( dtl::is_same< allocator_traits::const_pointer , Scoped2Inner::const_pointer>::value )); //void_pointer - BOOST_STATIC_ASSERT(( container_detail::is_same< allocator_traits::void_pointer + BOOST_STATIC_ASSERT(( dtl::is_same< allocator_traits::void_pointer , Scoped0Inner::void_pointer>::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same< allocator_traits::void_pointer + BOOST_STATIC_ASSERT(( dtl::is_same< allocator_traits::void_pointer , Scoped1Inner::void_pointer>::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same< allocator_traits::void_pointer + BOOST_STATIC_ASSERT(( dtl::is_same< allocator_traits::void_pointer , Scoped2Inner::void_pointer>::value )); //const_void_pointer - BOOST_STATIC_ASSERT(( container_detail::is_same< allocator_traits::const_void_pointer + BOOST_STATIC_ASSERT(( dtl::is_same< allocator_traits::const_void_pointer , Scoped0Inner::const_void_pointer>::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same< allocator_traits::const_void_pointer + BOOST_STATIC_ASSERT(( dtl::is_same< allocator_traits::const_void_pointer , Scoped1Inner::const_void_pointer>::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same< allocator_traits::const_void_pointer + BOOST_STATIC_ASSERT(( dtl::is_same< allocator_traits::const_void_pointer , Scoped2Inner::const_void_pointer>::value )); //rebind - BOOST_STATIC_ASSERT(( container_detail::is_same >::other + BOOST_STATIC_ASSERT(( dtl::is_same >::other , Rebound9Scoped0Inner >::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same >::other + BOOST_STATIC_ASSERT(( dtl::is_same >::other , Rebound9Scoped1Inner >::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same >::other + BOOST_STATIC_ASSERT(( dtl::is_same >::other , Rebound9Scoped2Inner >::value )); //inner_allocator_type - BOOST_STATIC_ASSERT(( container_detail::is_same< Scoped0Inner + BOOST_STATIC_ASSERT(( dtl::is_same< Scoped0Inner , Scoped0Inner::inner_allocator_type>::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same< scoped_allocator_adaptor + BOOST_STATIC_ASSERT(( dtl::is_same< scoped_allocator_adaptor , Scoped1Inner::inner_allocator_type>::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same< scoped_allocator_adaptor + BOOST_STATIC_ASSERT(( dtl::is_same< scoped_allocator_adaptor , Scoped2Inner::inner_allocator_type>::value )); { @@ -685,15 +685,15 @@ int main() //Check outer_allocator_type is scoped BOOST_STATIC_ASSERT(( is_scoped_allocator ::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same + BOOST_STATIC_ASSERT(( dtl::is_same < outermost_allocator::type , Outer10IdAlloc >::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same + BOOST_STATIC_ASSERT(( dtl::is_same < ScopedScoped0Inner::outer_allocator_type , scoped_allocator_adaptor >::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same + BOOST_STATIC_ASSERT(( dtl::is_same < scoped_allocator_adaptor::outer_allocator_type , Outer10IdAlloc >::value )); @@ -768,15 +768,15 @@ int main() //Check outer_allocator_type is scoped BOOST_STATIC_ASSERT(( is_scoped_allocator ::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same + BOOST_STATIC_ASSERT(( dtl::is_same < outermost_allocator::type , Outer10IdAlloc >::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same + BOOST_STATIC_ASSERT(( dtl::is_same < ScopedScoped1Inner::outer_allocator_type , scoped_allocator_adaptor >::value )); - BOOST_STATIC_ASSERT(( container_detail::is_same + BOOST_STATIC_ASSERT(( dtl::is_same < scoped_allocator_adaptor::outer_allocator_type , Outer10IdAlloc >::value )); @@ -856,7 +856,7 @@ int main() //used to construct types. //////////////////////////////////////////////////////////// { - using container_detail::pair; + using dtl::pair; typedef propagation_test_allocator< pair< tagged_integer<0> , tagged_integer<0> >, 0> OuterPairAlloc; // diff --git a/test/scoped_allocator_usage_test.cpp b/test/scoped_allocator_usage_test.cpp index 8cf9311..6eb1438 100644 --- a/test/scoped_allocator_usage_test.cpp +++ b/test/scoped_allocator_usage_test.cpp @@ -341,7 +341,7 @@ bool test_value_and_state_equals(const alloc_int &r, int value, int state) { return r.get_value() == value && r.get_allocator_state() == state; } template -bool test_value_and_state_equals(const container_detail::pair &p, int value, int state) +bool test_value_and_state_equals(const dtl::pair &p, int value, int state) { return test_value_and_state_equals(p.first, value, state) && test_alloc_state_equals(p.second, value, state); } template diff --git a/test/set_test.hpp b/test/set_test.hpp index c78b6bb..03e0bb9 100644 --- a/test/set_test.hpp +++ b/test/set_test.hpp @@ -30,11 +30,11 @@ namespace container { namespace test{ template -void set_test_rebalanceable(C &, boost::container::container_detail::false_type) +void set_test_rebalanceable(C &, boost::container::dtl::false_type) {} template -void set_test_rebalanceable(C &c, boost::container::container_detail::true_type) +void set_test_rebalanceable(C &c, boost::container::dtl::true_type) { c.rebalance(); } @@ -43,7 +43,7 @@ template -int set_test_copyable(boost::container::container_detail::false_type) +int set_test_copyable(boost::container::dtl::false_type) { return 0; } const int MaxElem = 50; @@ -52,7 +52,7 @@ template -int set_test_copyable(boost::container::container_detail::true_type) +int set_test_copyable(boost::container::dtl::true_type) { typedef typename MyBoostSet::value_type IntType; @@ -564,13 +564,13 @@ int set_test () return 1; } set_test_rebalanceable(boostset - , container_detail::bool_::value>()); + , dtl::bool_::value>()); if(!CheckEqualContainers(boostset, stdset)){ std::cout << "Error in boostset.rebalance()" << std::endl; return 1; } set_test_rebalanceable(boostmultiset - , container_detail::bool_::value>()); + , dtl::bool_::value>()); if(!CheckEqualContainers(boostmultiset, stdmultiset)){ std::cout << "Error in boostmultiset.rebalance()" << std::endl; return 1; @@ -794,7 +794,7 @@ int set_test () } if(set_test_copyable - (container_detail::bool_::value>())){ + (dtl::bool_::value>())){ return 1; } diff --git a/test/tree_test.cpp b/test/tree_test.cpp index d1140dd..c1a1c3d 100644 --- a/test/tree_test.cpp +++ b/test/tree_test.cpp @@ -22,7 +22,7 @@ namespace container { //Explicit instantiation to detect compilation errors -namespace container_detail { +namespace dtl { //Instantiate base class as previous instantiations don't instantiate inherited members template class tree @@ -73,7 +73,7 @@ template class tree , tree_assoc_defaults >; -} //container_detail { +} //dtl { }} //boost::container diff --git a/test/vector_test.cpp b/test/vector_test.cpp index a52cba7..5b8f431 100644 --- a/test/vector_test.cpp +++ b/test/vector_test.cpp @@ -38,7 +38,7 @@ template class boost::container::vector < test::movable_and_copyable_int , allocator >; -namespace container_detail { +namespace dtl { template class vec_iterator; template class vec_iterator; diff --git a/test/vector_test.hpp b/test/vector_test.hpp index 659f140..a2573cf 100644 --- a/test/vector_test.hpp +++ b/test/vector_test.hpp @@ -55,13 +55,13 @@ struct vector_hash_function_capacity }; template -bool vector_vector_hash_function_capacity_only(V1&, V2&, boost::container::container_detail::false_type) +bool vector_vector_hash_function_capacity_only(V1&, V2&, boost::container::dtl::false_type) { return true; } template -bool vector_vector_hash_function_capacity_only(MyBoostVector&boostvector, MyStdVector&stdvector, boost::container::container_detail::true_type) +bool vector_vector_hash_function_capacity_only(MyBoostVector&boostvector, MyStdVector&stdvector, boost::container::dtl::true_type) { //deque has no reserve boostvector.reserve(boostvector.size()*2); @@ -89,14 +89,14 @@ bool vector_vector_hash_function_capacity_only(MyBoostVector&boostvector, MyStdV template -bool vector_copyable_only(V1&, V2&, boost::container::container_detail::false_type) +bool vector_copyable_only(V1&, V2&, boost::container::dtl::false_type) { return true; } //Function to check if both sets are equal template -bool vector_copyable_only(MyBoostVector &boostvector, MyStdVector &stdvector, boost::container::container_detail::true_type) +bool vector_copyable_only(MyBoostVector &boostvector, MyStdVector &stdvector, boost::container::dtl::true_type) { typedef typename MyBoostVector::value_type IntType; std::size_t size = boostvector.size(); @@ -403,7 +403,7 @@ int vector_test() } if(!vector_copyable_only(boostvector, stdvector - ,container_detail::bool_::value>())){ + ,dtl::bool_::value>())){ return 1; } @@ -453,7 +453,7 @@ int vector_test() if(!test::CheckEqualContainers(boostvector, stdvector)) return 1; } - if(!vector_vector_hash_function_capacity_only(boostvector, stdvector, container_detail::bool_::value>())) + if(!vector_vector_hash_function_capacity_only(boostvector, stdvector, dtl::bool_::value>())) return 1; boostvector.clear();