Imported Upstream version 1.58.0upstream/1.58.0

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

1 files changed, 13 insertions, 17 deletions

diff --git a/boost/intrusive/splay_set.hpp b/boost/intrusive/splay_set.hpp
index cefc7926a2..80887dffdc 100644
--- a/boost/intrusive/splay_set.hpp
+++ b/boost/intrusive/splay_set.hpp
@@ -12,10 +12,6 @@
 #ifndef BOOST_INTRUSIVE_SPLAY_SET_HPP
 #define BOOST_INTRUSIVE_SPLAY_SET_HPP
 
-#if defined(_MSC_VER)
-#  pragma once
-#endif
-
 #include <boost/intrusive/detail/config_begin.hpp>
 #include <boost/intrusive/intrusive_fwd.hpp>
 #include <boost/intrusive/splaytree.hpp>
@@ -23,6 +19,10 @@
 #include <boost/move/utility_core.hpp>
 #include <boost/static_assert.hpp>
 
+#if defined(BOOST_HAS_PRAGMA_ONCE)
+#  pragma once
+#endif
+
 namespace boost {
 namespace intrusive {
 
@@ -95,12 +95,12 @@ class splay_set_impl
 
    //! @copydoc ::boost::intrusive::splaytree::splaytree(splaytree &&)
    splay_set_impl(BOOST_RV_REF(splay_set_impl) x)
-      :  tree_type(::boost::move(static_cast<tree_type&>(x)))
+      :  tree_type(BOOST_MOVE_BASE(tree_type, x))
    {}
 
    //! @copydoc ::boost::intrusive::splaytree::operator=(splaytree &&)
    splay_set_impl& operator=(BOOST_RV_REF(splay_set_impl) x)
-   {  return static_cast<splay_set_impl&>(tree_type::operator=(::boost::move(static_cast<tree_type&>(x)))); }
+   {  return static_cast<splay_set_impl&>(tree_type::operator=(BOOST_MOVE_BASE(tree_type, x))); }
 
    #ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
    //! @copydoc ::boost::intrusive::splaytree::~splaytree()
@@ -172,7 +172,7 @@ class splay_set_impl
    //! @copydoc ::boost::intrusive::splaytree::clone_from
    template <class Cloner, class Disposer>
    void clone_from(const splay_set_impl &src, Cloner cloner, Disposer disposer);
-   
+
    #endif   //#ifdef BOOST_iNTRUSIVE_DOXYGEN_INVOKED
 
    //! @copydoc ::boost::intrusive::splaytree::insert_unique(reference)
@@ -273,7 +273,7 @@ class splay_set_impl
 
    //! @copydoc ::boost::intrusive::splaytree::lower_bound(const_reference)
    iterator lower_bound(const_reference value);
-   
+
    //! @copydoc ::boost::intrusive::splaytree::lower_bound(const KeyType&,KeyValueCompare)
    template<class KeyType, class KeyValueCompare>
    iterator lower_bound(const KeyType& key, KeyValueCompare comp);
@@ -388,7 +388,7 @@ class splay_set_impl
 
    //! @copydoc ::boost::intrusive::splaytree::splay_down(const_reference)
    iterator splay_down(const_reference value);
-   
+
    //! @copydoc ::boost::intrusive::splaytree::rebalance
    void rebalance();
 
@@ -439,15 +439,13 @@ struct make_splay_set
 
    typedef typename detail::get_value_traits
       <T, typename packed_options::proto_value_traits>::type value_traits;
-   typedef typename detail::get_header_holder_type
-      < value_traits, typename packed_options::header_holder_type >::type header_holder_type;
 
    typedef splay_set_impl
          < value_traits
          , typename packed_options::compare
          , typename packed_options::size_type
          , packed_options::constant_time_size
-         , header_holder_type
+         , typename packed_options::header_holder_type
          > implementation_defined;
    /// @endcond
    typedef implementation_defined type;
@@ -738,7 +736,7 @@ class splay_multiset_impl
 
    //! @copydoc ::boost::intrusive::splaytree::lower_bound(const_reference)
    iterator lower_bound(const_reference value);
-   
+
    //! @copydoc ::boost::intrusive::splaytree::lower_bound(const KeyType&,KeyValueCompare)
    template<class KeyType, class KeyValueCompare>
    iterator lower_bound(const KeyType& key, KeyValueCompare comp);
@@ -845,7 +843,7 @@ class splay_multiset_impl
 
    //! @copydoc ::boost::intrusive::splaytree::splay_down(const_reference)
    iterator splay_down(const_reference value);
-   
+
    //! @copydoc ::boost::intrusive::splaytree::rebalance
    void rebalance();
 
@@ -896,15 +894,13 @@ struct make_splay_multiset
 
    typedef typename detail::get_value_traits
       <T, typename packed_options::proto_value_traits>::type value_traits;
-   typedef typename detail::get_header_holder_type
-      < value_traits, typename packed_options::header_holder_type >::type header_holder_type;
 
    typedef splay_multiset_impl
          < value_traits
          , typename packed_options::compare
          , typename packed_options::size_type
          , packed_options::constant_time_size
-         , header_holder_type
+         , typename packed_options::header_holder_type
          > implementation_defined;
    /// @endcond
    typedef implementation_defined type;