Break options.hpp dependencies, now hooks don't depend on heavy meta-machinery.

test/splay_multiset_test.cpp

@@ -10,7 +10,6 @@
 // See http://www.boost.org/libs/intrusive for documentation.
 //
 /////////////////////////////////////////////////////////////////////////////
-#include <boost/intrusive/detail/config_begin.hpp>
 #include <boost/intrusive/splay_set.hpp>
 #include <boost/intrusive/pointer_traits.hpp>
 #include "itestvalue.hpp"
@@ -154,8 +153,7 @@ class test_main_template
                , GetContainer_With_Holder< Default_Holder >::template GetContainer
                >::test_all();
       test::test_generic_multiset < typename detail::get_member_value_traits
-                  < value_type
-                  , member_hook< value_type
+                  < member_hook< value_type
                               , typename hooks<VoidPointer>::member_hook_type
                               , &value_type::node_
                               >
@@ -191,10 +189,9 @@ class test_main_template<VoidPointer, false, Default_Holder>
                >::test_all();
 
       test::test_generic_multiset < typename detail::get_member_value_traits
-                  < value_type
-                  , member_hook< value_type
-                              , typename hooks<VoidPointer>::member_hook_type
-                              , &value_type::node_
+                  < member_hook< value_type
+                               , typename hooks<VoidPointer>::member_hook_type
+                               , &value_type::node_
                               >
                   >::type
                , GetContainer_With_Holder< Default_Holder >::template GetContainer
@@ -208,11 +205,10 @@ class test_main_template<VoidPointer, false, Default_Holder>
                >::test_all();
 
       test::test_generic_multiset < typename detail::get_member_value_traits
-                  < value_type
-                  , member_hook< value_type
-                              , typename hooks<VoidPointer>::auto_member_hook_type
-                              , &value_type::auto_node_
-                              >
+                  < member_hook< value_type
+                               , typename hooks<VoidPointer>::auto_member_hook_type
+                               , &value_type::auto_node_
+                               >
                   >::type
                , GetContainer_With_Holder< Default_Holder >::template GetContainer
                >::test_all();