Imported Upstream version 1.65.0upstream/1.65.0

Change-Id: Icf8400b375482cb11bcf77440a6934ba360d6ba4
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/boost/container/detail/adaptive_node_pool_impl.hpp b/boost/container/detail/adaptive_node_pool_impl.hpp
index 24c81dda3b..54db19dff2 100644
--- a/boost/container/detail/adaptive_node_pool_impl.hpp
+++ b/boost/container/detail/adaptive_node_pool_impl.hpp
@@ -28,10 +28,10 @@
 // container/detail
 #include <boost/container/detail/pool_common.hpp>
 #include <boost/container/detail/iterator.hpp>
-#include <boost/container/detail/iterator_to_raw_pointer.hpp>
+#include <boost/move/detail/iterator_to_raw_pointer.hpp>
 #include <boost/container/detail/math_functions.hpp>
 #include <boost/container/detail/mpl.hpp>
-#include <boost/container/detail/to_raw_pointer.hpp>
+#include <boost/move/detail/to_raw_pointer.hpp>
 #include <boost/container/detail/type_traits.hpp>
 // intrusive
 #include <boost/intrusive/pointer_traits.hpp>
@@ -378,7 +378,7 @@ class private_adaptive_node_pool_impl
 
    //!Returns the segment manager. Never throws
    segment_manager_base_type* get_segment_manager_base()const
-   {  return container_detail::to_raw_pointer(mp_segment_mngr_base);  }
+   {  return boost::movelib::to_raw_pointer(mp_segment_mngr_base);  }
 
    //!Allocates array of count elements. Can throw
    void *allocate_node()
@@ -390,7 +390,7 @@ class private_adaptive_node_pool_impl
          free_nodes_t &free_nodes = m_block_container.begin()->free_nodes;
          BOOST_ASSERT(!free_nodes.empty());
          const size_type free_nodes_count = free_nodes.size();
-         void *first_node = container_detail::to_raw_pointer(free_nodes.pop_front());
+         void *first_node = boost::movelib::to_raw_pointer(free_nodes.pop_front());
          if(free_nodes.empty()){
             block_container_traits_t::erase_first(m_block_container);
          }
@@ -401,7 +401,7 @@ class private_adaptive_node_pool_impl
       else{
          multiallocation_chain chain;
          this->priv_append_from_new_blocks(1, chain, IsAlignOnly());
-         return container_detail::to_raw_pointer(chain.pop_front());
+         return boost::movelib::to_raw_pointer(chain.pop_front());
       }
    }
 
@@ -492,7 +492,7 @@ class private_adaptive_node_pool_impl
          free_nodes_iterator itf(nodes.begin()), itbf(itbb);
          size_type splice_node_count = size_type(-1);
          while(itf != ite){
-            void *pElem = container_detail::to_raw_pointer(container_detail::iterator_to_raw_pointer(itf));
+            void *pElem = boost::movelib::to_raw_pointer(boost::movelib::iterator_to_raw_pointer(itf));
             block_info_t &block_info = *this->priv_block_from_node(pElem);
             BOOST_ASSERT(block_info.free_nodes.size() < m_real_num_node);
             ++splice_node_count;
@@ -631,7 +631,7 @@ class private_adaptive_node_pool_impl
          BOOST_ASSERT(to_deallocate->free_nodes.size() == mp_impl->m_real_num_node);
          BOOST_ASSERT(0 == to_deallocate->hdr_offset);
          hdr_offset_holder *hdr_off_holder =
-            mp_impl->priv_first_subblock_from_block(container_detail::to_raw_pointer(to_deallocate));
+            mp_impl->priv_first_subblock_from_block(boost::movelib::to_raw_pointer(to_deallocate));
          m_chain.push_back(hdr_off_holder);
       }
 
@@ -763,7 +763,7 @@ class private_adaptive_node_pool_impl
       //First add all possible nodes to the chain
       const size_type left = total_elements - chain.size();
       const size_type max_chain = (num_node < left) ? num_node : left;
-      mem_address = static_cast<char *>(container_detail::to_raw_pointer
+      mem_address = static_cast<char *>(boost::movelib::to_raw_pointer
          (chain.incorporate_after(chain.last(), void_pointer(mem_address), m_real_node_size, max_chain)));
       //Now store remaining nodes in the free list
       if(const size_type max_free = num_node - max_chain){