diff options
Diffstat (limited to 'boost/intrusive/list_hook.hpp')
| -rw-r--r-- | boost/intrusive/list_hook.hpp | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/boost/intrusive/list_hook.hpp b/boost/intrusive/list_hook.hpp index b674868242..1a06a980b7 100644 --- a/boost/intrusive/list_hook.hpp +++ b/boost/intrusive/list_hook.hpp @@ -1,7 +1,7 @@ ///////////////////////////////////////////////////////////////////////////// // // (C) Copyright Olaf Krzikalla 2004-2006. -// (C) Copyright Ion Gaztanaga 2006-2012 +// (C) Copyright Ion Gaztanaga 2006-2013 // // Distributed under the Boost Software License, Version 1.0. // (See accompanying file LICENSE_1_0.txt or copy at @@ -14,9 +14,13 @@ #ifndef BOOST_INTRUSIVE_LIST_HOOK_HPP #define BOOST_INTRUSIVE_LIST_HOOK_HPP +#if defined(_MSC_VER) +# pragma once +#endif + #include <boost/intrusive/detail/config_begin.hpp> #include <boost/intrusive/intrusive_fwd.hpp> -#include <boost/intrusive/detail/utilities.hpp> + #include <boost/intrusive/detail/list_node.hpp> #include <boost/intrusive/circular_list_algorithms.hpp> #include <boost/intrusive/options.hpp> @@ -25,20 +29,12 @@ namespace boost { namespace intrusive { -/// @cond -template<class VoidPointer> -struct get_list_node_algo -{ - typedef circular_list_algorithms<list_node_traits<VoidPointer> > type; -}; -/// @endcond - //! Helper metafunction to define a \c \c list_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) template<class ...Options> #else -template<class O1 = none, class O2 = none, class O3 = none> +template<class O1 = void, class O2 = void, class O3 = void> #endif struct make_list_base_hook { @@ -52,11 +48,11 @@ struct make_list_base_hook #endif >::type packed_options; - typedef detail::generic_hook - < get_list_node_algo<typename packed_options::void_pointer> + typedef generic_hook + < circular_list_algorithms<list_node_traits<typename packed_options::void_pointer> > , typename packed_options::tag , packed_options::link_mode - , detail::ListBaseHook + , ListBaseHookId > implementation_defined; /// @endcond typedef implementation_defined type; @@ -77,7 +73,7 @@ struct make_list_base_hook //! \c auto_unlink or \c safe_link). //! //! \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. #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) || defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) template<class ...Options> #else @@ -165,7 +161,7 @@ class list_base_hook #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) || defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) template<class ...Options> #else -template<class O1 = none, class O2 = none, class O3 = none> +template<class O1 = void, class O2 = void, class O3 = void> #endif struct make_list_member_hook { @@ -179,11 +175,11 @@ struct make_list_member_hook #endif >::type packed_options; - typedef detail::generic_hook - < get_list_node_algo<typename packed_options::void_pointer> + typedef generic_hook + < circular_list_algorithms<list_node_traits<typename packed_options::void_pointer> > , member_tag , packed_options::link_mode - , detail::NoBaseHook + , NoBaseHookId > implementation_defined; /// @endcond typedef implementation_defined type; @@ -199,7 +195,7 @@ struct make_list_member_hook //! \c auto_unlink or \c safe_link). //! //! \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. #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) || defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) template<class ...Options> #else |