Boost::intrusive 1.56 compatibility

diff --git a/tests/test-hdr/set/hdr_intrusive_refinable_hashset_splayset.cpp b/tests/test-hdr/set/hdr_intrusive_refinable_hashset_splayset.cpp
index 2e1ac245ba58467d8acc7534adfb30f7ce336bf5..f549466d0121d57b9ad92e9181c26830279435d2 100644 (file)
--- a/tests/test-hdr/set/hdr_intrusive_refinable_hashset_splayset.cpp
+++ b/tests/test-hdr/set/hdr_intrusive_refinable_hashset_splayset.cpp
@@ -8,8 +8,15 @@ namespace set {
     namespace bi = boost::intrusive;
 
     namespace {
-        typedef IntrusiveStripedSetHdrTest::base_item< bi::splay_set_base_hook<> > base_item_type;
-        typedef IntrusiveStripedSetHdrTest::member_item< bi::splay_set_member_hook<> > member_item_type;
+#   if BOOST_VERSION < 105600
+        typedef bi::splay_set_member_hook<> splay_set_member_hook;
+        typedef bi::splay_set_base_hook<> splay_set_base_hook;
+#else
+        typedef bi::bs_set_base_hook<> splay_set_member_hook;
+        typedef bi::bs_set_member_hook<> splay_set_base_hook;
+#endif
+        typedef IntrusiveStripedSetHdrTest::base_item< splay_set_base_hook > base_item_type;
+        typedef IntrusiveStripedSetHdrTest::member_item< splay_set_member_hook > member_item_type;
     }
 
     void IntrusiveStripedSetHdrTest::Refinable_splay_set_basehook()
@@ -54,7 +61,7 @@ namespace set {
         typedef ci::StripedSet<
             bi::splay_set<
                 member_item_type
-                , bi::member_hook< member_item_type, bi::splay_set_member_hook<>, &member_item_type::hMember>
+                , bi::member_hook< member_item_type, splay_set_member_hook, &member_item_type::hMember>
                 , bi::compare<IntrusiveStripedSetHdrTest::less<member_item_type> >
             >
             ,co::mutex_policy< ci::striped_set::refinable<> >
@@ -69,7 +76,7 @@ namespace set {
         typedef ci::StripedSet<
             bi::splay_set<
                 member_item_type
-                , bi::member_hook< member_item_type, bi::splay_set_member_hook<>, &member_item_type::hMember>
+                , bi::member_hook< member_item_type, bsplay_set_member_hook, &member_item_type::hMember>
                 , bi::compare<IntrusiveStripedSetHdrTest::less<member_item_type> >
             >
             ,co::mutex_policy< ci::striped_set::refinable<> >
@@ -85,7 +92,7 @@ namespace set {
         typedef ci::StripedSet<
             bi::splay_set<
                 member_item_type
-                , bi::member_hook< member_item_type, bi::splay_set_member_hook<>, &member_item_type::hMember>
+                , bi::member_hook< member_item_type, splay_set_member_hook, &member_item_type::hMember>
                 , bi::compare<IntrusiveStripedSetHdrTest::less<member_item_type> >
             >
             ,co::mutex_policy< ci::striped_set::refinable<> >

diff --git a/tests/test-hdr/set/hdr_intrusive_striped_hashset_splayset.cpp b/tests/test-hdr/set/hdr_intrusive_striped_hashset_splayset.cpp
index 1082ddf14ba213e93dda7859f01af61bb923dfd8..2e796b2f012e8ef20ccb354c67eb947642af6607 100644 (file)
--- a/tests/test-hdr/set/hdr_intrusive_striped_hashset_splayset.cpp
+++ b/tests/test-hdr/set/hdr_intrusive_striped_hashset_splayset.cpp
@@ -8,8 +8,16 @@ namespace set {
     namespace bi = boost::intrusive;
 
     namespace {
-        typedef IntrusiveStripedSetHdrTest::base_item< bi::splay_set_base_hook<> > base_item_type;
-        typedef IntrusiveStripedSetHdrTest::member_item< bi::splay_set_member_hook<> > member_item_type;
+#   if BOOST_VERSION < 105600
+        typedef bi::splay_set_member_hook<> splay_set_member_hook;
+        typedef bi::splay_set_base_hook<> splay_set_base_hook;
+#else
+        typedef bi::bs_set_base_hook<> splay_set_member_hook;
+        typedef bi::bs_set_member_hook<> splay_set_base_hook;
+#endif
+
+        typedef IntrusiveStripedSetHdrTest::base_item< splay_set_base_hook> base_item_type;
+        typedef IntrusiveStripedSetHdrTest::member_item< splay_set_member_hook > member_item_type;
     }
 
     void IntrusiveStripedSetHdrTest::Striped_splay_set_basehook()
@@ -51,7 +59,7 @@ namespace set {
         typedef ci::StripedSet<
             bi::splay_set<
                 member_item_type
-                , bi::member_hook< member_item_type, bi::splay_set_member_hook<>, &member_item_type::hMember>
+                , bi::member_hook< member_item_type, splay_set_member_hook, &member_item_type::hMember>
                 , bi::compare<IntrusiveStripedSetHdrTest::less<member_item_type> >
             >
             ,co::hash< IntrusiveStripedSetHdrTest::hash_int >
@@ -65,7 +73,7 @@ namespace set {
         typedef ci::StripedSet<
             bi::splay_set<
                 member_item_type
-                , bi::member_hook< member_item_type, bi::splay_set_member_hook<>, &member_item_type::hMember>
+                , bi::member_hook< member_item_type, splay_set_member_hook, &member_item_type::hMember>
                 , bi::compare<IntrusiveStripedSetHdrTest::less<member_item_type> >
             >
             ,co::hash< IntrusiveStripedSetHdrTest::hash_int >
@@ -80,7 +88,7 @@ namespace set {
         typedef ci::StripedSet<
             bi::splay_set<
                 member_item_type
-                , bi::member_hook< member_item_type, bi::splay_set_member_hook<>, &member_item_type::hMember>
+                , bi::member_hook< member_item_type, splay_set_member_hook, &member_item_type::hMember>
                 , bi::compare<IntrusiveStripedSetHdrTest::less<member_item_type> >
             >
             ,co::hash< IntrusiveStripedSetHdrTest::hash_int >