From 667ec0bdfca305810adc472bac62b61c7c50c937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= Date: Sun, 1 Feb 2015 23:15:14 +0100 Subject: [PATCH] Make sure boost/config.hpp is included before pragma once. --- include/boost/intrusive/any_hook.hpp | 8 ++-- include/boost/intrusive/avl_set.hpp | 8 ++-- include/boost/intrusive/avl_set_hook.hpp | 8 ++-- include/boost/intrusive/avltree.hpp | 9 ++-- .../boost/intrusive/avltree_algorithms.hpp | 9 ++-- include/boost/intrusive/bs_set.hpp | 8 ++-- include/boost/intrusive/bs_set_hook.hpp | 8 ++-- include/boost/intrusive/bstree.hpp | 7 ++- include/boost/intrusive/bstree_algorithms.hpp | 48 +++++++++---------- .../intrusive/circular_list_algorithms.hpp | 8 ++-- .../intrusive/circular_slist_algorithms.hpp | 7 ++- .../intrusive/derivation_value_traits.hpp | 8 ++-- include/boost/intrusive/detail/algo_type.hpp | 4 ++ include/boost/intrusive/detail/algorithm.hpp | 4 ++ .../detail/any_node_and_algorithms.hpp | 4 ++ .../intrusive/detail/array_initializer.hpp | 4 ++ include/boost/intrusive/detail/assert.hpp | 4 ++ .../boost/intrusive/detail/avltree_node.hpp | 4 ++ .../detail/bstree_algorithms_base.hpp | 4 ++ .../detail/common_slist_algorithms.hpp | 4 ++ .../detail/default_header_holder.hpp | 4 ++ .../intrusive/detail/ebo_functor_holder.hpp | 6 ++- .../intrusive/detail/empty_node_checker.hpp | 4 ++ .../boost/intrusive/detail/equal_to_value.hpp | 4 ++ .../intrusive/detail/exception_disposer.hpp | 4 ++ .../intrusive/detail/function_detector.hpp | 4 ++ .../boost/intrusive/detail/generic_hook.hpp | 4 ++ .../intrusive/detail/get_value_traits.hpp | 4 ++ .../boost/intrusive/detail/hashtable_node.hpp | 4 ++ .../boost/intrusive/detail/hook_traits.hpp | 4 ++ include/boost/intrusive/detail/iiterator.hpp | 4 ++ .../detail/is_stateful_value_traits.hpp | 4 ++ include/boost/intrusive/detail/iterator.hpp | 4 ++ .../intrusive/detail/key_nodeptr_comp.hpp | 4 ++ .../boost/intrusive/detail/list_iterator.hpp | 4 ++ include/boost/intrusive/detail/list_node.hpp | 4 ++ include/boost/intrusive/detail/math.hpp | 4 ++ .../detail/minimal_less_equal_header.hpp | 8 ++-- include/boost/intrusive/detail/mpl.hpp | 4 ++ .../intrusive/detail/node_cloner_disposer.hpp | 4 ++ .../boost/intrusive/detail/node_holder.hpp | 4 ++ .../boost/intrusive/detail/node_to_value.hpp | 4 ++ .../intrusive/detail/parent_from_member.hpp | 4 ++ .../intrusive/detail/pointer_element.hpp | 4 ++ .../boost/intrusive/detail/rbtree_node.hpp | 4 ++ .../intrusive/detail/reverse_iterator.hpp | 4 ++ .../intrusive/detail/simple_disposers.hpp | 4 ++ .../boost/intrusive/detail/size_holder.hpp | 4 ++ .../boost/intrusive/detail/slist_iterator.hpp | 4 ++ include/boost/intrusive/detail/slist_node.hpp | 4 ++ include/boost/intrusive/detail/std_fwd.hpp | 4 ++ .../boost/intrusive/detail/to_raw_pointer.hpp | 4 ++ .../intrusive/detail/transform_iterator.hpp | 4 ++ .../boost/intrusive/detail/tree_iterator.hpp | 4 ++ include/boost/intrusive/detail/tree_node.hpp | 4 ++ include/boost/intrusive/detail/uncast.hpp | 4 ++ include/boost/intrusive/detail/workaround.hpp | 4 ++ include/boost/intrusive/hashtable.hpp | 7 ++- include/boost/intrusive/intrusive_fwd.hpp | 4 ++ .../intrusive/linear_slist_algorithms.hpp | 8 ++-- include/boost/intrusive/list.hpp | 8 ++-- include/boost/intrusive/list_hook.hpp | 9 ++-- .../boost/intrusive/member_value_traits.hpp | 8 ++-- include/boost/intrusive/options.hpp | 8 ++-- include/boost/intrusive/pack_options.hpp | 4 +- .../boost/intrusive/parent_from_member.hpp | 8 ++-- include/boost/intrusive/pointer_plus_bits.hpp | 8 ++-- include/boost/intrusive/pointer_rebind.hpp | 12 +++-- include/boost/intrusive/pointer_traits.hpp | 8 ++-- include/boost/intrusive/priority_compare.hpp | 8 ++-- include/boost/intrusive/rbtree.hpp | 8 ++-- include/boost/intrusive/set.hpp | 8 ++-- include/boost/intrusive/set_hook.hpp | 8 ++-- include/boost/intrusive/sg_set.hpp | 8 ++-- include/boost/intrusive/sgtree.hpp | 7 ++- include/boost/intrusive/sgtree_algorithms.hpp | 8 ++-- include/boost/intrusive/slist.hpp | 8 ++-- include/boost/intrusive/slist_hook.hpp | 8 ++-- include/boost/intrusive/splay_set.hpp | 8 ++-- include/boost/intrusive/splaytree.hpp | 8 ++-- .../boost/intrusive/splaytree_algorithms.hpp | 8 ++-- include/boost/intrusive/treap.hpp | 7 ++- include/boost/intrusive/treap_algorithms.hpp | 7 ++- include/boost/intrusive/treap_set.hpp | 8 ++-- .../boost/intrusive/trivial_value_traits.hpp | 8 ++-- include/boost/intrusive/unordered_set.hpp | 8 ++-- .../boost/intrusive/unordered_set_hook.hpp | 8 ++-- test/generic_assoc_test.hpp | 15 +++--- 88 files changed, 373 insertions(+), 197 deletions(-) diff --git a/include/boost/intrusive/any_hook.hpp b/include/boost/intrusive/any_hook.hpp index aa65706..809507c 100644 --- a/include/boost/intrusive/any_hook.hpp +++ b/include/boost/intrusive/any_hook.hpp @@ -13,10 +13,6 @@ #ifndef BOOST_INTRUSIVE_ANY_HOOK_HPP #define BOOST_INTRUSIVE_ANY_HOOK_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include #include @@ -25,6 +21,10 @@ #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/avl_set.hpp b/include/boost/intrusive/avl_set.hpp index 070fbe3..d06d441 100644 --- a/include/boost/intrusive/avl_set.hpp +++ b/include/boost/intrusive/avl_set.hpp @@ -12,10 +12,6 @@ #ifndef BOOST_INTRUSIVE_AVL_SET_HPP #define BOOST_INTRUSIVE_AVL_SET_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include #include @@ -23,6 +19,10 @@ #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/avl_set_hook.hpp b/include/boost/intrusive/avl_set_hook.hpp index bc4dfbf..b61f95f 100644 --- a/include/boost/intrusive/avl_set_hook.hpp +++ b/include/boost/intrusive/avl_set_hook.hpp @@ -13,10 +13,6 @@ #ifndef BOOST_INTRUSIVE_AVL_SET_HOOK_HPP #define BOOST_INTRUSIVE_AVL_SET_HOOK_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include @@ -25,6 +21,10 @@ #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/avltree.hpp b/include/boost/intrusive/avltree.hpp index 8444241..1996d69 100644 --- a/include/boost/intrusive/avltree.hpp +++ b/include/boost/intrusive/avltree.hpp @@ -12,17 +12,12 @@ #ifndef BOOST_INTRUSIVE_AVLTREE_HPP #define BOOST_INTRUSIVE_AVLTREE_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include #include #include #include - #include #include #include @@ -36,6 +31,10 @@ #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/avltree_algorithms.hpp b/include/boost/intrusive/avltree_algorithms.hpp index 93cf094..60a981c 100644 --- a/include/boost/intrusive/avltree_algorithms.hpp +++ b/include/boost/intrusive/avltree_algorithms.hpp @@ -14,10 +14,6 @@ #ifndef BOOST_INTRUSIVE_AVLTREE_ALGORITHMS_HPP #define BOOST_INTRUSIVE_AVLTREE_ALGORITHMS_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include @@ -28,6 +24,11 @@ #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/bs_set.hpp b/include/boost/intrusive/bs_set.hpp index a0d080e..f246ce6 100644 --- a/include/boost/intrusive/bs_set.hpp +++ b/include/boost/intrusive/bs_set.hpp @@ -12,10 +12,6 @@ #ifndef BOOST_INTRUSIVE_BS_SET_HPP #define BOOST_INTRUSIVE_BS_SET_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include #include @@ -23,6 +19,10 @@ #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/bs_set_hook.hpp b/include/boost/intrusive/bs_set_hook.hpp index a4264a4..e96248b 100644 --- a/include/boost/intrusive/bs_set_hook.hpp +++ b/include/boost/intrusive/bs_set_hook.hpp @@ -13,10 +13,6 @@ #ifndef BOOST_INTRUSIVE_BS_SET_HOOK_HPP #define BOOST_INTRUSIVE_BS_SET_HOOK_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include @@ -25,6 +21,10 @@ #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/bstree.hpp b/include/boost/intrusive/bstree.hpp index 972a236..8659cd4 100644 --- a/include/boost/intrusive/bstree.hpp +++ b/include/boost/intrusive/bstree.hpp @@ -12,10 +12,6 @@ #ifndef BOOST_INTRUSIVE_BSTREE_HPP #define BOOST_INTRUSIVE_BSTREE_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include @@ -51,6 +47,9 @@ #include //size_t... #include //less, equal_to +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/bstree_algorithms.hpp b/include/boost/intrusive/bstree_algorithms.hpp index 7718fe3..4e72e5d 100644 --- a/include/boost/intrusive/bstree_algorithms.hpp +++ b/include/boost/intrusive/bstree_algorithms.hpp @@ -13,10 +13,6 @@ #ifndef BOOST_INTRUSIVE_BSTREE_ALGORITHMS_HPP #define BOOST_INTRUSIVE_BSTREE_ALGORITHMS_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include #include @@ -28,6 +24,10 @@ #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { @@ -1413,27 +1413,25 @@ class bstree_algorithms : public bstree_algorithms_base template static void check(const const_node_ptr& header, Checker checker, typename Checker::return_type& checker_return) { - const_node_ptr root_node_ptr = NodeTraits::get_parent(header); - if (!root_node_ptr) - { - // check left&right header pointers - BOOST_INTRUSIVE_INVARIANT_ASSERT(NodeTraits::get_left(header) == header); - BOOST_INTRUSIVE_INVARIANT_ASSERT(NodeTraits::get_right(header) == header); - } - else - { - // check parent pointer of root node - BOOST_INTRUSIVE_INVARIANT_ASSERT(NodeTraits::get_parent(root_node_ptr) == header); - // check subtree from root - check_subtree(root_node_ptr, checker, checker_return); - // check left&right header pointers - const_node_ptr p = root_node_ptr; - while (NodeTraits::get_left(p)) { p = NodeTraits::get_left(p); } - BOOST_INTRUSIVE_INVARIANT_ASSERT(NodeTraits::get_left(header) == p); - p = root_node_ptr; - while (NodeTraits::get_right(p)) { p = NodeTraits::get_right(p); } - BOOST_INTRUSIVE_INVARIANT_ASSERT(NodeTraits::get_right(header) == p); - } + const_node_ptr root_node_ptr = NodeTraits::get_parent(header); + if (!root_node_ptr){ + // check left&right header pointers + BOOST_INTRUSIVE_INVARIANT_ASSERT(NodeTraits::get_left(header) == header); + BOOST_INTRUSIVE_INVARIANT_ASSERT(NodeTraits::get_right(header) == header); + } + else{ + // check parent pointer of root node + BOOST_INTRUSIVE_INVARIANT_ASSERT(NodeTraits::get_parent(root_node_ptr) == header); + // check subtree from root + check_subtree(root_node_ptr, checker, checker_return); + // check left&right header pointers + const_node_ptr p = root_node_ptr; + while (NodeTraits::get_left(p)) { p = NodeTraits::get_left(p); } + BOOST_INTRUSIVE_INVARIANT_ASSERT(NodeTraits::get_left(header) == p); + p = root_node_ptr; + while (NodeTraits::get_right(p)) { p = NodeTraits::get_right(p); } + BOOST_INTRUSIVE_INVARIANT_ASSERT(NodeTraits::get_right(header) == p); + } } protected: diff --git a/include/boost/intrusive/circular_list_algorithms.hpp b/include/boost/intrusive/circular_list_algorithms.hpp index d554982..f343045 100644 --- a/include/boost/intrusive/circular_list_algorithms.hpp +++ b/include/boost/intrusive/circular_list_algorithms.hpp @@ -14,16 +14,16 @@ #ifndef BOOST_INTRUSIVE_CIRCULAR_LIST_ALGORITHMS_HPP #define BOOST_INTRUSIVE_CIRCULAR_LIST_ALGORITHMS_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include #include #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/circular_slist_algorithms.hpp b/include/boost/intrusive/circular_slist_algorithms.hpp index f3f0b92..951a40a 100644 --- a/include/boost/intrusive/circular_slist_algorithms.hpp +++ b/include/boost/intrusive/circular_slist_algorithms.hpp @@ -14,16 +14,15 @@ #ifndef BOOST_INTRUSIVE_CIRCULAR_SLIST_ALGORITHMS_HPP #define BOOST_INTRUSIVE_CIRCULAR_SLIST_ALGORITHMS_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include #include #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/derivation_value_traits.hpp b/include/boost/intrusive/derivation_value_traits.hpp index c43b699..0699198 100644 --- a/include/boost/intrusive/derivation_value_traits.hpp +++ b/include/boost/intrusive/derivation_value_traits.hpp @@ -13,15 +13,15 @@ #ifndef BOOST_INTRUSIVE_DERIVATION_VALUE_TRAITS_HPP #define BOOST_INTRUSIVE_DERIVATION_VALUE_TRAITS_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/detail/algo_type.hpp b/include/boost/intrusive/detail/algo_type.hpp index 726ec2f..6da48e9 100644 --- a/include/boost/intrusive/detail/algo_type.hpp +++ b/include/boost/intrusive/detail/algo_type.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_ALGO_TYPE_HPP #define BOOST_INTRUSIVE_DETAIL_ALGO_TYPE_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/algorithm.hpp b/include/boost/intrusive/detail/algorithm.hpp index c2506e4..d2421ff 100644 --- a/include/boost/intrusive/detail/algorithm.hpp +++ b/include/boost/intrusive/detail/algorithm.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_ALGORITHM_HPP #define BOOST_INTRUSIVE_DETAIL_ALGORITHM_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/any_node_and_algorithms.hpp b/include/boost/intrusive/detail/any_node_and_algorithms.hpp index fb12fe8..8c8d949 100644 --- a/include/boost/intrusive/detail/any_node_and_algorithms.hpp +++ b/include/boost/intrusive/detail/any_node_and_algorithms.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_ANY_NODE_HPP #define BOOST_INTRUSIVE_ANY_NODE_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/array_initializer.hpp b/include/boost/intrusive/detail/array_initializer.hpp index bcb97f7..126a253 100644 --- a/include/boost/intrusive/detail/array_initializer.hpp +++ b/include/boost/intrusive/detail/array_initializer.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_ARRAY_INITIALIZER_HPP #define BOOST_INTRUSIVE_DETAIL_ARRAY_INITIALIZER_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/assert.hpp b/include/boost/intrusive/detail/assert.hpp index fe5ccd4..7199eb2 100644 --- a/include/boost/intrusive/detail/assert.hpp +++ b/include/boost/intrusive/detail/assert.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_ASSERT_HPP #define BOOST_INTRUSIVE_DETAIL_ASSERT_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) #pragma once #endif diff --git a/include/boost/intrusive/detail/avltree_node.hpp b/include/boost/intrusive/detail/avltree_node.hpp index 08c16d9..22b8fd1 100644 --- a/include/boost/intrusive/detail/avltree_node.hpp +++ b/include/boost/intrusive/detail/avltree_node.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_AVLTREE_NODE_HPP #define BOOST_INTRUSIVE_AVLTREE_NODE_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/bstree_algorithms_base.hpp b/include/boost/intrusive/detail/bstree_algorithms_base.hpp index 267c86e..ed28a43 100644 --- a/include/boost/intrusive/detail/bstree_algorithms_base.hpp +++ b/include/boost/intrusive/detail/bstree_algorithms_base.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_BSTREE_ALGORITHMS_BASE_HPP #define BOOST_INTRUSIVE_BSTREE_ALGORITHMS_BASE_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/common_slist_algorithms.hpp b/include/boost/intrusive/detail/common_slist_algorithms.hpp index 15e38ce..deaea7c 100644 --- a/include/boost/intrusive/detail/common_slist_algorithms.hpp +++ b/include/boost/intrusive/detail/common_slist_algorithms.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_COMMON_SLIST_ALGORITHMS_HPP #define BOOST_INTRUSIVE_COMMON_SLIST_ALGORITHMS_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/default_header_holder.hpp b/include/boost/intrusive/detail/default_header_holder.hpp index 9e1a0e3..d10109b 100644 --- a/include/boost/intrusive/detail/default_header_holder.hpp +++ b/include/boost/intrusive/detail/default_header_holder.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_DEFAULT_HEADER_HOLDER_HPP #define BOOST_INTRUSIVE_DETAIL_DEFAULT_HEADER_HOLDER_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/ebo_functor_holder.hpp b/include/boost/intrusive/detail/ebo_functor_holder.hpp index 443534c..b2c5908 100644 --- a/include/boost/intrusive/detail/ebo_functor_holder.hpp +++ b/include/boost/intrusive/detail/ebo_functor_holder.hpp @@ -14,12 +14,14 @@ #ifndef BOOST_INTRUSIVE_DETAIL_EBO_HOLDER_HPP #define BOOST_INTRUSIVE_DETAIL_EBO_HOLDER_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif -#include - namespace boost { namespace intrusive { namespace detail { diff --git a/include/boost/intrusive/detail/empty_node_checker.hpp b/include/boost/intrusive/detail/empty_node_checker.hpp index b5a36d9..16aa560 100644 --- a/include/boost/intrusive/detail/empty_node_checker.hpp +++ b/include/boost/intrusive/detail/empty_node_checker.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_EMPTY_NODE_CHECKER_HPP #define BOOST_INTRUSIVE_DETAIL_EMPTY_NODE_CHECKER_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/equal_to_value.hpp b/include/boost/intrusive/detail/equal_to_value.hpp index 88984fa..c341f48 100644 --- a/include/boost/intrusive/detail/equal_to_value.hpp +++ b/include/boost/intrusive/detail/equal_to_value.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_EQUAL_TO_VALUE_HPP #define BOOST_INTRUSIVE_DETAIL_EQUAL_TO_VALUE_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/exception_disposer.hpp b/include/boost/intrusive/detail/exception_disposer.hpp index 18346fb..a10d63a 100644 --- a/include/boost/intrusive/detail/exception_disposer.hpp +++ b/include/boost/intrusive/detail/exception_disposer.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_EXCEPTION_DISPOSER_HPP #define BOOST_INTRUSIVE_DETAIL_EXCEPTION_DISPOSER_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/function_detector.hpp b/include/boost/intrusive/detail/function_detector.hpp index a655081..5ecaeaf 100644 --- a/include/boost/intrusive/detail/function_detector.hpp +++ b/include/boost/intrusive/detail/function_detector.hpp @@ -22,6 +22,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_FUNCTION_DETECTOR_HPP #define BOOST_INTRUSIVE_DETAIL_FUNCTION_DETECTOR_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/generic_hook.hpp b/include/boost/intrusive/detail/generic_hook.hpp index 961a708..b57a12b 100644 --- a/include/boost/intrusive/detail/generic_hook.hpp +++ b/include/boost/intrusive/detail/generic_hook.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_GENERIC_HOOK_HPP #define BOOST_INTRUSIVE_GENERIC_HOOK_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/get_value_traits.hpp b/include/boost/intrusive/detail/get_value_traits.hpp index c4c784e..686e059 100644 --- a/include/boost/intrusive/detail/get_value_traits.hpp +++ b/include/boost/intrusive/detail/get_value_traits.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_GET_VALUE_TRAITS_HPP #define BOOST_INTRUSIVE_DETAIL_GET_VALUE_TRAITS_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/hashtable_node.hpp b/include/boost/intrusive/detail/hashtable_node.hpp index 841256f..923a3e1 100644 --- a/include/boost/intrusive/detail/hashtable_node.hpp +++ b/include/boost/intrusive/detail/hashtable_node.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_HASHTABLE_NODE_HPP #define BOOST_INTRUSIVE_HASHTABLE_NODE_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/hook_traits.hpp b/include/boost/intrusive/detail/hook_traits.hpp index 15c7701..71f342a 100644 --- a/include/boost/intrusive/detail/hook_traits.hpp +++ b/include/boost/intrusive/detail/hook_traits.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_HOOK_TRAITS_HPP #define BOOST_INTRUSIVE_DETAIL_HOOK_TRAITS_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/iiterator.hpp b/include/boost/intrusive/detail/iiterator.hpp index f66ae59..5c6721b 100644 --- a/include/boost/intrusive/detail/iiterator.hpp +++ b/include/boost/intrusive/detail/iiterator.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_IITERATOR_HPP #define BOOST_INTRUSIVE_DETAIL_IITERATOR_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/is_stateful_value_traits.hpp b/include/boost/intrusive/detail/is_stateful_value_traits.hpp index 84ace90..680b043 100644 --- a/include/boost/intrusive/detail/is_stateful_value_traits.hpp +++ b/include/boost/intrusive/detail/is_stateful_value_traits.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_IS_STATEFUL_VALUE_TRAITS_HPP #define BOOST_INTRUSIVE_DETAIL_IS_STATEFUL_VALUE_TRAITS_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/iterator.hpp b/include/boost/intrusive/detail/iterator.hpp index 5f52947..fb6fb81 100644 --- a/include/boost/intrusive/detail/iterator.hpp +++ b/include/boost/intrusive/detail/iterator.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_ITERATOR_HPP #define BOOST_INTRUSIVE_DETAIL_ITERATOR_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/key_nodeptr_comp.hpp b/include/boost/intrusive/detail/key_nodeptr_comp.hpp index bf100bc..8c45663 100644 --- a/include/boost/intrusive/detail/key_nodeptr_comp.hpp +++ b/include/boost/intrusive/detail/key_nodeptr_comp.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_KEY_NODEPTR_COMP_HPP #define BOOST_INTRUSIVE_DETAIL_KEY_NODEPTR_COMP_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/list_iterator.hpp b/include/boost/intrusive/detail/list_iterator.hpp index 3b82b53..77c9fa6 100644 --- a/include/boost/intrusive/detail/list_iterator.hpp +++ b/include/boost/intrusive/detail/list_iterator.hpp @@ -14,6 +14,10 @@ #ifndef BOOST_INTRUSIVE_LIST_ITERATOR_HPP #define BOOST_INTRUSIVE_LIST_ITERATOR_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/list_node.hpp b/include/boost/intrusive/detail/list_node.hpp index 87b1f23..f740e54 100644 --- a/include/boost/intrusive/detail/list_node.hpp +++ b/include/boost/intrusive/detail/list_node.hpp @@ -14,6 +14,10 @@ #ifndef BOOST_INTRUSIVE_LIST_NODE_HPP #define BOOST_INTRUSIVE_LIST_NODE_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/math.hpp b/include/boost/intrusive/detail/math.hpp index 477198d..03000fc 100644 --- a/include/boost/intrusive/detail/math.hpp +++ b/include/boost/intrusive/detail/math.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_MATH_HPP #define BOOST_INTRUSIVE_DETAIL_MATH_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/minimal_less_equal_header.hpp b/include/boost/intrusive/detail/minimal_less_equal_header.hpp index f988d78..5e8a19d 100644 --- a/include/boost/intrusive/detail/minimal_less_equal_header.hpp +++ b/include/boost/intrusive/detail/minimal_less_equal_header.hpp @@ -12,14 +12,14 @@ #ifndef BOOST_INTRUSIVE_DETAIL_MINIMAL_LESS_EQUAL_HEADER_HPP #define BOOST_INTRUSIVE_DETAIL_MINIMAL_LESS_EQUAL_HEADER_HPP # -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif -# #ifndef BOOST_CONFIG_HPP # include #endif # +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif +# #//Try to avoid including , as it's quite big in C++11 #if defined(BOOST_GNU_STDLIB) # include diff --git a/include/boost/intrusive/detail/mpl.hpp b/include/boost/intrusive/detail/mpl.hpp index ee480c0..39d2c58 100644 --- a/include/boost/intrusive/detail/mpl.hpp +++ b/include/boost/intrusive/detail/mpl.hpp @@ -14,6 +14,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_MPL_HPP #define BOOST_INTRUSIVE_DETAIL_MPL_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/node_cloner_disposer.hpp b/include/boost/intrusive/detail/node_cloner_disposer.hpp index 9bd26ad..48c7c93 100644 --- a/include/boost/intrusive/detail/node_cloner_disposer.hpp +++ b/include/boost/intrusive/detail/node_cloner_disposer.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_NODE_CLONER_DISPOSER_HPP #define BOOST_INTRUSIVE_DETAIL_NODE_CLONER_DISPOSER_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/node_holder.hpp b/include/boost/intrusive/detail/node_holder.hpp index c1a8608..b8dabef 100644 --- a/include/boost/intrusive/detail/node_holder.hpp +++ b/include/boost/intrusive/detail/node_holder.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_NODE_HOLDER_HPP #define BOOST_INTRUSIVE_DETAIL_NODE_HOLDER_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/node_to_value.hpp b/include/boost/intrusive/detail/node_to_value.hpp index 65b051a..5af3347 100644 --- a/include/boost/intrusive/detail/node_to_value.hpp +++ b/include/boost/intrusive/detail/node_to_value.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_NODE_TO_VALUE_HPP #define BOOST_INTRUSIVE_DETAIL_NODE_TO_VALUE_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/parent_from_member.hpp b/include/boost/intrusive/detail/parent_from_member.hpp index 053c954..30eba13 100644 --- a/include/boost/intrusive/detail/parent_from_member.hpp +++ b/include/boost/intrusive/detail/parent_from_member.hpp @@ -12,6 +12,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_PARENT_FROM_MEMBER_HPP #define BOOST_INTRUSIVE_DETAIL_PARENT_FROM_MEMBER_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/pointer_element.hpp b/include/boost/intrusive/detail/pointer_element.hpp index 2f2b2f1..dd26e3c 100644 --- a/include/boost/intrusive/detail/pointer_element.hpp +++ b/include/boost/intrusive/detail/pointer_element.hpp @@ -11,6 +11,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_POINTER_ELEMENT_HPP #define BOOST_INTRUSIVE_DETAIL_POINTER_ELEMENT_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/rbtree_node.hpp b/include/boost/intrusive/detail/rbtree_node.hpp index 77e32e9..c436439 100644 --- a/include/boost/intrusive/detail/rbtree_node.hpp +++ b/include/boost/intrusive/detail/rbtree_node.hpp @@ -14,6 +14,10 @@ #ifndef BOOST_INTRUSIVE_RBTREE_NODE_HPP #define BOOST_INTRUSIVE_RBTREE_NODE_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/reverse_iterator.hpp b/include/boost/intrusive/detail/reverse_iterator.hpp index 73756d3..3a41283 100644 --- a/include/boost/intrusive/detail/reverse_iterator.hpp +++ b/include/boost/intrusive/detail/reverse_iterator.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_REVERSE_ITERATOR_HPP #define BOOST_INTRUSIVE_DETAIL_REVERSE_ITERATOR_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/simple_disposers.hpp b/include/boost/intrusive/detail/simple_disposers.hpp index 34dcfd5..1420b28 100644 --- a/include/boost/intrusive/detail/simple_disposers.hpp +++ b/include/boost/intrusive/detail/simple_disposers.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_SIMPLE_DISPOSERS_HPP #define BOOST_INTRUSIVE_DETAIL_SIMPLE_DISPOSERS_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/size_holder.hpp b/include/boost/intrusive/detail/size_holder.hpp index 6cec6a4..de1933e 100644 --- a/include/boost/intrusive/detail/size_holder.hpp +++ b/include/boost/intrusive/detail/size_holder.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_SIZE_HOLDER_HPP #define BOOST_INTRUSIVE_DETAIL_SIZE_HOLDER_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/slist_iterator.hpp b/include/boost/intrusive/detail/slist_iterator.hpp index bbb221e..80a6fef 100644 --- a/include/boost/intrusive/detail/slist_iterator.hpp +++ b/include/boost/intrusive/detail/slist_iterator.hpp @@ -14,6 +14,10 @@ #ifndef BOOST_INTRUSIVE_SLIST_ITERATOR_HPP #define BOOST_INTRUSIVE_SLIST_ITERATOR_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/slist_node.hpp b/include/boost/intrusive/detail/slist_node.hpp index b51dd9c..3d5fbfb 100644 --- a/include/boost/intrusive/detail/slist_node.hpp +++ b/include/boost/intrusive/detail/slist_node.hpp @@ -14,6 +14,10 @@ #ifndef BOOST_INTRUSIVE_SLIST_NODE_HPP #define BOOST_INTRUSIVE_SLIST_NODE_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/std_fwd.hpp b/include/boost/intrusive/detail/std_fwd.hpp index a82fe5d..7add9ed 100644 --- a/include/boost/intrusive/detail/std_fwd.hpp +++ b/include/boost/intrusive/detail/std_fwd.hpp @@ -11,6 +11,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_STD_FWD_HPP #define BOOST_INTRUSIVE_DETAIL_STD_FWD_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/to_raw_pointer.hpp b/include/boost/intrusive/detail/to_raw_pointer.hpp index ad41994..387f63f 100644 --- a/include/boost/intrusive/detail/to_raw_pointer.hpp +++ b/include/boost/intrusive/detail/to_raw_pointer.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_TO_RAW_POINTER_HPP #define BOOST_INTRUSIVE_DETAIL_TO_RAW_POINTER_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/transform_iterator.hpp b/include/boost/intrusive/detail/transform_iterator.hpp index 623a56a..89ec973 100644 --- a/include/boost/intrusive/detail/transform_iterator.hpp +++ b/include/boost/intrusive/detail/transform_iterator.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_TRANSFORM_ITERATOR_HPP #define BOOST_INTRUSIVE_DETAIL_TRANSFORM_ITERATOR_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/tree_iterator.hpp b/include/boost/intrusive/detail/tree_iterator.hpp index 430562b..525761f 100644 --- a/include/boost/intrusive/detail/tree_iterator.hpp +++ b/include/boost/intrusive/detail/tree_iterator.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_TREE_ITERATOR_HPP #define BOOST_INTRUSIVE_TREE_ITERATOR_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/tree_node.hpp b/include/boost/intrusive/detail/tree_node.hpp index 45a0a0a..e36a82a 100644 --- a/include/boost/intrusive/detail/tree_node.hpp +++ b/include/boost/intrusive/detail/tree_node.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_TREE_NODE_HPP #define BOOST_INTRUSIVE_TREE_NODE_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/uncast.hpp b/include/boost/intrusive/detail/uncast.hpp index de1dfec..7db97b7 100644 --- a/include/boost/intrusive/detail/uncast.hpp +++ b/include/boost/intrusive/detail/uncast.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_UNCAST_HPP #define BOOST_INTRUSIVE_DETAIL_UNCAST_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/detail/workaround.hpp b/include/boost/intrusive/detail/workaround.hpp index bfebb33..b73f4ef 100644 --- a/include/boost/intrusive/detail/workaround.hpp +++ b/include/boost/intrusive/detail/workaround.hpp @@ -11,6 +11,10 @@ #ifndef BOOST_INTRUSIVE_DETAIL_WORKAROUND_HPP #define BOOST_INTRUSIVE_DETAIL_WORKAROUND_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/hashtable.hpp b/include/boost/intrusive/hashtable.hpp index 7cdfd54..1d4f3d3 100644 --- a/include/boost/intrusive/hashtable.hpp +++ b/include/boost/intrusive/hashtable.hpp @@ -12,10 +12,6 @@ #ifndef BOOST_INTRUSIVE_HASHTABLE_HPP #define BOOST_INTRUSIVE_HASHTABLE_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include @@ -50,6 +46,9 @@ #include //std::lower_bound, std::upper_bound #include //std::size_t +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/intrusive_fwd.hpp b/include/boost/intrusive/intrusive_fwd.hpp index 1c9ccf6..88cb537 100644 --- a/include/boost/intrusive/intrusive_fwd.hpp +++ b/include/boost/intrusive/intrusive_fwd.hpp @@ -13,6 +13,10 @@ #ifndef BOOST_INTRUSIVE_FWD_HPP #define BOOST_INTRUSIVE_FWD_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/include/boost/intrusive/linear_slist_algorithms.hpp b/include/boost/intrusive/linear_slist_algorithms.hpp index 26d970d..4b1f06f 100644 --- a/include/boost/intrusive/linear_slist_algorithms.hpp +++ b/include/boost/intrusive/linear_slist_algorithms.hpp @@ -14,10 +14,6 @@ #ifndef BOOST_INTRUSIVE_LINEAR_SLIST_ALGORITHMS_HPP #define BOOST_INTRUSIVE_LINEAR_SLIST_ALGORITHMS_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include #include @@ -25,6 +21,10 @@ #include #include //std::pair +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/list.hpp b/include/boost/intrusive/list.hpp index 077ca66..906b002 100644 --- a/include/boost/intrusive/list.hpp +++ b/include/boost/intrusive/list.hpp @@ -14,10 +14,6 @@ #ifndef BOOST_INTRUSIVE_LIST_HPP #define BOOST_INTRUSIVE_LIST_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include #include @@ -46,6 +42,10 @@ #include //std::less #include //std::size_t, etc. +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/list_hook.hpp b/include/boost/intrusive/list_hook.hpp index 52b5436..aef7253 100644 --- a/include/boost/intrusive/list_hook.hpp +++ b/include/boost/intrusive/list_hook.hpp @@ -14,10 +14,6 @@ #ifndef BOOST_INTRUSIVE_LIST_HOOK_HPP #define BOOST_INTRUSIVE_LIST_HOOK_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include @@ -26,6 +22,11 @@ #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/member_value_traits.hpp b/include/boost/intrusive/member_value_traits.hpp index 034b33f..b540178 100644 --- a/include/boost/intrusive/member_value_traits.hpp +++ b/include/boost/intrusive/member_value_traits.hpp @@ -13,10 +13,6 @@ #ifndef BOOST_INTRUSIVE_MEMBER_VALUE_TRAITS_HPP #define BOOST_INTRUSIVE_MEMBER_VALUE_TRAITS_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include @@ -24,6 +20,10 @@ #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/options.hpp b/include/boost/intrusive/options.hpp index 34b7f3f..ec6e967 100644 --- a/include/boost/intrusive/options.hpp +++ b/include/boost/intrusive/options.hpp @@ -13,16 +13,16 @@ #ifndef BOOST_INTRUSIVE_OPTIONS_HPP #define BOOST_INTRUSIVE_OPTIONS_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include #include #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/pack_options.hpp b/include/boost/intrusive/pack_options.hpp index d738e58..944243f 100644 --- a/include/boost/intrusive/pack_options.hpp +++ b/include/boost/intrusive/pack_options.hpp @@ -13,12 +13,12 @@ #ifndef BOOST_INTRUSIVE_PACK_OPTIONS_HPP #define BOOST_INTRUSIVE_PACK_OPTIONS_HPP +#include + #if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif -#include - namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/parent_from_member.hpp b/include/boost/intrusive/parent_from_member.hpp index 3952bb6..af3aa1f 100644 --- a/include/boost/intrusive/parent_from_member.hpp +++ b/include/boost/intrusive/parent_from_member.hpp @@ -12,15 +12,15 @@ #ifndef BOOST_INTRUSIVE_PARENT_FROM_MEMBER_HPP #define BOOST_INTRUSIVE_PARENT_FROM_MEMBER_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/pointer_plus_bits.hpp b/include/boost/intrusive/pointer_plus_bits.hpp index 20b92b3..117aff3 100644 --- a/include/boost/intrusive/pointer_plus_bits.hpp +++ b/include/boost/intrusive/pointer_plus_bits.hpp @@ -13,15 +13,15 @@ #ifndef BOOST_INTRUSIVE_POINTER_PLUS_BITS_HPP #define BOOST_INTRUSIVE_POINTER_PLUS_BITS_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include #include //ls_zeros #include //BOOST_INTRUSIVE_INVARIANT_ASSERT +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/pointer_rebind.hpp b/include/boost/intrusive/pointer_rebind.hpp index 2aaa0af..9592e06 100644 --- a/include/boost/intrusive/pointer_rebind.hpp +++ b/include/boost/intrusive/pointer_rebind.hpp @@ -11,14 +11,18 @@ #ifndef BOOST_INTRUSIVE_POINTER_REBIND_HPP #define BOOST_INTRUSIVE_POINTER_REBIND_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #ifndef BOOST_INTRUSIVE_DETAIL_WORKAROUND_HPP #include #endif //BOOST_INTRUSIVE_DETAIL_WORKAROUND_HPP +#ifndef BOOST_CONFIG_HPP +# include +#endif + +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/pointer_traits.hpp b/include/boost/intrusive/pointer_traits.hpp index 01c7c5e..24843fd 100644 --- a/include/boost/intrusive/pointer_traits.hpp +++ b/include/boost/intrusive/pointer_traits.hpp @@ -17,10 +17,6 @@ #ifndef BOOST_INTRUSIVE_POINTER_TRAITS_HPP #define BOOST_INTRUSIVE_POINTER_TRAITS_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include #include @@ -28,6 +24,10 @@ #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { namespace detail { diff --git a/include/boost/intrusive/priority_compare.hpp b/include/boost/intrusive/priority_compare.hpp index 9fceff4..2ff851f 100644 --- a/include/boost/intrusive/priority_compare.hpp +++ b/include/boost/intrusive/priority_compare.hpp @@ -13,15 +13,15 @@ #ifndef BOOST_INTRUSIVE_PRIORITY_COMPARE_HPP #define BOOST_INTRUSIVE_PRIORITY_COMPARE_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/rbtree.hpp b/include/boost/intrusive/rbtree.hpp index e0bce03..892390b 100644 --- a/include/boost/intrusive/rbtree.hpp +++ b/include/boost/intrusive/rbtree.hpp @@ -12,10 +12,6 @@ #ifndef BOOST_INTRUSIVE_RBTREE_HPP #define BOOST_INTRUSIVE_RBTREE_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include #include @@ -35,6 +31,10 @@ #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/set.hpp b/include/boost/intrusive/set.hpp index 101b36f..1048429 100644 --- a/include/boost/intrusive/set.hpp +++ b/include/boost/intrusive/set.hpp @@ -13,10 +13,6 @@ #ifndef BOOST_INTRUSIVE_SET_HPP #define BOOST_INTRUSIVE_SET_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include @@ -25,6 +21,10 @@ #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/set_hook.hpp b/include/boost/intrusive/set_hook.hpp index d68ccc2..b641280 100644 --- a/include/boost/intrusive/set_hook.hpp +++ b/include/boost/intrusive/set_hook.hpp @@ -14,10 +14,6 @@ #ifndef BOOST_INTRUSIVE_SET_HOOK_HPP #define BOOST_INTRUSIVE_SET_HOOK_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include @@ -26,6 +22,10 @@ #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/sg_set.hpp b/include/boost/intrusive/sg_set.hpp index b155c96..7e250cb 100644 --- a/include/boost/intrusive/sg_set.hpp +++ b/include/boost/intrusive/sg_set.hpp @@ -12,10 +12,6 @@ #ifndef BOOST_INTRUSIVE_SG_SET_HPP #define BOOST_INTRUSIVE_SG_SET_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include #include @@ -23,6 +19,10 @@ #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/sgtree.hpp b/include/boost/intrusive/sgtree.hpp index 6591b1a..feeaf3b 100644 --- a/include/boost/intrusive/sgtree.hpp +++ b/include/boost/intrusive/sgtree.hpp @@ -18,10 +18,6 @@ #ifndef BOOST_INTRUSIVE_SGTREE_HPP #define BOOST_INTRUSIVE_SGTREE_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include #include @@ -46,6 +42,9 @@ #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/sgtree_algorithms.hpp b/include/boost/intrusive/sgtree_algorithms.hpp index 1f707a9..2d74184 100644 --- a/include/boost/intrusive/sgtree_algorithms.hpp +++ b/include/boost/intrusive/sgtree_algorithms.hpp @@ -17,10 +17,6 @@ #ifndef BOOST_INTRUSIVE_SGTREE_ALGORITHMS_HPP #define BOOST_INTRUSIVE_SGTREE_ALGORITHMS_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include @@ -28,7 +24,9 @@ #include #include - +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/slist.hpp b/include/boost/intrusive/slist.hpp index 66447d1..7575081 100644 --- a/include/boost/intrusive/slist.hpp +++ b/include/boost/intrusive/slist.hpp @@ -14,10 +14,6 @@ #ifndef BOOST_INTRUSIVE_SLIST_HPP #define BOOST_INTRUSIVE_SLIST_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include @@ -49,6 +45,10 @@ #include //std::size_t #include //std::pair +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/slist_hook.hpp b/include/boost/intrusive/slist_hook.hpp index 161be91..eac2737 100644 --- a/include/boost/intrusive/slist_hook.hpp +++ b/include/boost/intrusive/slist_hook.hpp @@ -14,10 +14,6 @@ #ifndef BOOST_INTRUSIVE_SLIST_HOOK_HPP #define BOOST_INTRUSIVE_SLIST_HOOK_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include @@ -27,6 +23,10 @@ #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/splay_set.hpp b/include/boost/intrusive/splay_set.hpp index 9d7e314..80887df 100644 --- a/include/boost/intrusive/splay_set.hpp +++ b/include/boost/intrusive/splay_set.hpp @@ -12,10 +12,6 @@ #ifndef BOOST_INTRUSIVE_SPLAY_SET_HPP #define BOOST_INTRUSIVE_SPLAY_SET_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include #include @@ -23,6 +19,10 @@ #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/splaytree.hpp b/include/boost/intrusive/splaytree.hpp index fef3c68..e3866aa 100644 --- a/include/boost/intrusive/splaytree.hpp +++ b/include/boost/intrusive/splaytree.hpp @@ -12,10 +12,6 @@ #ifndef BOOST_INTRUSIVE_SPLAYTREE_HPP #define BOOST_INTRUSIVE_SPLAYTREE_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include #include @@ -34,6 +30,10 @@ #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/splaytree_algorithms.hpp b/include/boost/intrusive/splaytree_algorithms.hpp index 4cc46f2..1c6afdf 100644 --- a/include/boost/intrusive/splaytree_algorithms.hpp +++ b/include/boost/intrusive/splaytree_algorithms.hpp @@ -30,10 +30,6 @@ #ifndef BOOST_INTRUSIVE_SPLAYTREE_ALGORITHMS_HPP #define BOOST_INTRUSIVE_SPLAYTREE_ALGORITHMS_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include #include @@ -43,6 +39,10 @@ #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/treap.hpp b/include/boost/intrusive/treap.hpp index b7d7df0..bf37469 100644 --- a/include/boost/intrusive/treap.hpp +++ b/include/boost/intrusive/treap.hpp @@ -12,10 +12,6 @@ #ifndef BOOST_INTRUSIVE_TREAP_HPP #define BOOST_INTRUSIVE_TREAP_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include @@ -41,6 +37,9 @@ #include #include //std::pair +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/treap_algorithms.hpp b/include/boost/intrusive/treap_algorithms.hpp index d1f0fb1..006a880 100644 --- a/include/boost/intrusive/treap_algorithms.hpp +++ b/include/boost/intrusive/treap_algorithms.hpp @@ -13,10 +13,6 @@ #ifndef BOOST_INTRUSIVE_TREAP_ALGORITHMS_HPP #define BOOST_INTRUSIVE_TREAP_ALGORITHMS_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include @@ -26,6 +22,9 @@ #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/treap_set.hpp b/include/boost/intrusive/treap_set.hpp index b9df4ef..a88df58 100644 --- a/include/boost/intrusive/treap_set.hpp +++ b/include/boost/intrusive/treap_set.hpp @@ -12,10 +12,6 @@ #ifndef BOOST_INTRUSIVE_TREAP_SET_HPP #define BOOST_INTRUSIVE_TREAP_SET_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include #include @@ -23,6 +19,10 @@ #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/trivial_value_traits.hpp b/include/boost/intrusive/trivial_value_traits.hpp index 5048c5e..03deb16 100644 --- a/include/boost/intrusive/trivial_value_traits.hpp +++ b/include/boost/intrusive/trivial_value_traits.hpp @@ -13,15 +13,15 @@ #ifndef BOOST_INTRUSIVE_TRIVIAL_VALUE_TRAITS_HPP #define BOOST_INTRUSIVE_TRIVIAL_VALUE_TRAITS_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/unordered_set.hpp b/include/boost/intrusive/unordered_set.hpp index 04ff5ea..4b0c91e 100644 --- a/include/boost/intrusive/unordered_set.hpp +++ b/include/boost/intrusive/unordered_set.hpp @@ -13,16 +13,16 @@ #ifndef BOOST_INTRUSIVE_UNORDERED_SET_HPP #define BOOST_INTRUSIVE_UNORDERED_SET_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include #include #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/include/boost/intrusive/unordered_set_hook.hpp b/include/boost/intrusive/unordered_set_hook.hpp index 2aecbc3..95a575a 100644 --- a/include/boost/intrusive/unordered_set_hook.hpp +++ b/include/boost/intrusive/unordered_set_hook.hpp @@ -14,10 +14,6 @@ #ifndef BOOST_INTRUSIVE_UNORDERED_SET_HOOK_HPP #define BOOST_INTRUSIVE_UNORDERED_SET_HOOK_HPP -#if defined(BOOST_HAS_PRAGMA_ONCE) -# pragma once -#endif - #include #include @@ -26,6 +22,10 @@ #include #include +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + namespace boost { namespace intrusive { diff --git a/test/generic_assoc_test.hpp b/test/generic_assoc_test.hpp index bf819b4..0107afe 100644 --- a/test/generic_assoc_test.hpp +++ b/test/generic_assoc_test.hpp @@ -129,9 +129,9 @@ void test_generic_assoc::test_insert_erase_burst( typedef typename ValueTraits::value_type value_type; //value_cont_type values; - const int MaxValues = 100; + const std::size_t MaxValues = 200; value_cont_type values(MaxValues); - for(int i = 0; i != MaxValues; ++i){ + for(std::size_t i = 0; i != MaxValues; ++i){ (&values[i])->value_ = i; } @@ -146,11 +146,12 @@ void test_generic_assoc::test_insert_erase_burst( { //Ordered insertion + erasure assoc_type testset (values.begin(), values.begin() + values.size()); TEST_INTRUSIVE_SEQUENCE_EXPECTED(testset, testset.begin()); - + testset.check(); iterator it(testset.begin()), itend(testset.end()); - for(int i = 0; it != itend; ++i){ + for(std::size_t i = 0; it != itend; ++i){ BOOST_TEST(&*it == &values[i]); it = testset.erase(it); + testset.check(); } BOOST_TEST(testset.empty()); } @@ -165,14 +166,16 @@ void test_generic_assoc::test_insert_erase_burst( ; ++it){ it_vector.push_back(it); } - for(int i = 0; i != MaxValues; ++i){ + for(std::size_t i = 0; i != MaxValues; ++i){ testset.insert(*it_vector[i]); + testset.check(); } TEST_INTRUSIVE_SEQUENCE_EXPECTED(testset, testset.begin()); //Random erasure std::random_shuffle(it_vector.begin(), it_vector.end()); - for(int i = 0; i != MaxValues; ++i){ + for(std::size_t i = 0; i != MaxValues; ++i){ testset.erase(testset.iterator_to(*it_vector[i])); + testset.check(); } BOOST_TEST(testset.empty()); }