diff DEPENDENCIES/generic/include/boost/intrusive/set_hook.hpp @ 101:c530137014c0

Update Boost headers (1.58.0)

--- a/DEPENDENCIES/generic/include/boost/intrusive/set_hook.hpp	Fri Sep 04 12:01:02 2015 +0100
+++ b/DEPENDENCIES/generic/include/boost/intrusive/set_hook.hpp	Mon Sep 07 11:12:49 2015 +0100
@@ -16,23 +16,19 @@
 
 #include <boost/intrusive/detail/config_begin.hpp>
 #include <boost/intrusive/intrusive_fwd.hpp>
-#include <boost/intrusive/detail/utilities.hpp>
+
 #include <boost/intrusive/detail/rbtree_node.hpp>
 #include <boost/intrusive/rbtree_algorithms.hpp>
 #include <boost/intrusive/options.hpp>
 #include <boost/intrusive/detail/generic_hook.hpp>
 
+#if defined(BOOST_HAS_PRAGMA_ONCE)
+#  pragma once
+#endif
+
 namespace boost {
 namespace intrusive {
 
-/// @cond
-template<class VoidPointer, bool OptimizeSize = false>
-struct get_set_node_algo
-{
-   typedef rbtree_algorithms<rbtree_node_traits<VoidPointer, OptimizeSize> > type;
-};
-/// @endcond
-
 //! Helper metafunction to define a \c set_base_hook that yields to the same
 //! type when the same options (either explicitly or implicitly) are used.
 #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) || defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
@@ -53,8 +49,7 @@
       >::type packed_options;
 
    typedef generic_hook
-   < get_set_node_algo<typename packed_options::void_pointer
-                      ,packed_options::optimize_size>
+   < rbtree_algorithms<rbtree_node_traits<typename packed_options::void_pointer, packed_options::optimize_size> >
    , typename packed_options::tag
    , packed_options::link_mode
    , RbTreeBaseHookId
@@ -76,7 +71,7 @@
 //! unique tag.
 //!
 //! \c void_pointer<> is the pointer type that will be used internally in the hook
-//! and the the container configured to use this hook.
+//! and the container configured to use this hook.
 //!
 //! \c link_mode<> will specify the linking mode of the hook (\c normal_link,
 //! \c auto_unlink or \c safe_link).
@@ -185,8 +180,7 @@
       >::type packed_options;
 
    typedef generic_hook
-   < get_set_node_algo<typename packed_options::void_pointer
-                      ,packed_options::optimize_size>
+   < rbtree_algorithms<rbtree_node_traits<typename packed_options::void_pointer, packed_options::optimize_size> >
    , member_tag
    , packed_options::link_mode
    , NoBaseHookId
@@ -203,7 +197,7 @@
 //! \c link_mode<> and \c optimize_size<>.
 //!
 //! \c void_pointer<> is the pointer type that will be used internally in the hook
-//! and the the container configured to use this hook.
+//! and the container configured to use this hook.
 //!
 //! \c link_mode<> will specify the linking mode of the hook (\c normal_link,
 //! \c auto_unlink or \c safe_link).