From b8cf34c691623e4ec329053cbbf68522a855882d Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Thu, 5 Dec 2019 15:12:59 +0900 Subject: Imported Upstream version 1.67.0 --- boost/container/detail/iterators.hpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'boost/container/detail/iterators.hpp') diff --git a/boost/container/detail/iterators.hpp b/boost/container/detail/iterators.hpp index 11ffaae65e..7ccdac911c 100644 --- a/boost/container/detail/iterators.hpp +++ b/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; -- cgit v1.2.3