diff options
Diffstat (limited to 'boost/container/scoped_allocator.hpp')
| -rw-r--r-- | boost/container/scoped_allocator.hpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/boost/container/scoped_allocator.hpp b/boost/container/scoped_allocator.hpp index 6a041a653d..6cd69fe430 100644 --- a/boost/container/scoped_allocator.hpp +++ b/boost/container/scoped_allocator.hpp @@ -44,7 +44,7 @@ namespace boost { namespace container { #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED -namespace container_detail { +namespace dtl { template <typename Allocator> struct is_scoped_allocator_imp @@ -99,16 +99,16 @@ struct outermost_allocator_imp<MaybeScopedAlloc, true> { return outermost_allocator_imp<outer_type>::get(a.outer_allocator()); } }; -} //namespace container_detail { +} //namespace dtl { template <typename Allocator> struct is_scoped_allocator - : container_detail::is_scoped_allocator_imp<Allocator> + : dtl::is_scoped_allocator_imp<Allocator> {}; template <typename Allocator> struct outermost_allocator - : container_detail::outermost_allocator_imp<Allocator> + : dtl::outermost_allocator_imp<Allocator> {}; template <typename Allocator> @@ -121,7 +121,7 @@ const typename outermost_allocator<Allocator>::type & get_outermost_allocator(const Allocator &a) { return outermost_allocator<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_allocator_type> inner_traits_type; typedef scoped_allocator_adaptor <OuterAlloc, InnerAllocs...> 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<OuterAlloc, true, BOOST_MOVE_TARG##N>\ typedef scoped_allocator_adaptor<BOOST_MOVE_TARG##N> inner_allocator_type;\ typedef scoped_allocator_adaptor<OuterAlloc, BOOST_MOVE_TARG##N> scoped_allocator_type;\ typedef allocator_traits<inner_allocator_type> 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 <typename OuterAlloc, BOOST_MOVE_CLASS9> class scoped_allocator_adaptor #endif - : public container_detail::scoped_allocator_adaptor_base + : public dtl::scoped_allocator_adaptor_base <OuterAlloc BOOST_CONTAINER_SCOPEDALLOC_DUMMYTRUE, BOOST_CONTAINER_SCOPEDALLOC_ALLINNER> { 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 <OuterAlloc BOOST_CONTAINER_SCOPEDALLOC_DUMMYTRUE, BOOST_CONTAINER_SCOPEDALLOC_ALLINNER> 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>(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<OuterA1, BOOST_CONTAINER_S #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED) const bool has_zero_inner = sizeof...(InnerAllocs) == 0u; #else - const bool has_zero_inner = boost::container::container_detail::is_same<P0, void>::value; + const bool has_zero_inner = boost::container::dtl::is_same<P0, void>::value; #endif typedef scoped_allocator_operator_equal<has_zero_inner> equal_t; return equal_t::equal_outer(a.outer_allocator(), b.outer_allocator()) && |