Fixed compatibility with boost 1.59 for striped intrusive sets

[libcds.git] / tests / test-hdr / set / hdr_intrusive_refinable_hashset_avlset.cpp

diff --git a/tests/test-hdr/set/hdr_intrusive_refinable_hashset_avlset.cpp b/tests/test-hdr/set/hdr_intrusive_refinable_hashset_avlset.cpp
index b754e76313f183e54fe19ba3b3ebdddd063e5fff..7343d7c901dc1a3e932a19a570974dc26a7619a1 100644 (file)
--- a/tests/test-hdr/set/hdr_intrusive_refinable_hashset_avlset.cpp
+++ b/tests/test-hdr/set/hdr_intrusive_refinable_hashset_avlset.cpp
@@ -10,12 +10,32 @@ namespace set {
     namespace {
         typedef IntrusiveStripedSetHdrTest::base_item< bi::avl_set_base_hook<> > base_item_type;
         typedef IntrusiveStripedSetHdrTest::member_item< bi::avl_set_member_hook<> > member_item_type;
+
+        template <typename T, typename Node>
+        struct get_key
+        {
+            typedef T type;
+
+            type const& operator()( Node const& v ) const
+            {
+                return v.nKey;
+            }
+        };
     }
 
+#if BOOST_VERSION >= 105900
+#   define CDS_BOOST_INTRUSIVE_KEY_OF_VALUE_OPTION( type ) ,bi::key_of_value< get_key< int, type>>
+#else
+#   define CDS_BOOST_INTRUSIVE_KEY_OF_VALUE_OPTION( type )
+#endif
+
     void IntrusiveStripedSetHdrTest::Refinable_avl_set_basehook()
     {
         typedef ci::StripedSet<
-            bi::avl_set<base_item_type, bi::compare<IntrusiveStripedSetHdrTest::less<base_item_type> > >
+            bi::avl_set<base_item_type
+                , bi::compare<IntrusiveStripedSetHdrTest::less<base_item_type>>
+                CDS_BOOST_INTRUSIVE_KEY_OF_VALUE_OPTION( base_item_type )
+            >
             ,co::mutex_policy< ci::striped_set::refinable<> >
             ,co::hash< IntrusiveStripedSetHdrTest::hash_int >
             ,co::back_off< cds::backoff::empty >
@@ -27,7 +47,10 @@ namespace set {
     void IntrusiveStripedSetHdrTest::Refinable_avl_set_basehook_bucket_threshold()
     {
         typedef ci::StripedSet<
-            bi::avl_set<base_item_type, bi::compare<IntrusiveStripedSetHdrTest::less<base_item_type> > >
+            bi::avl_set<base_item_type
+                , bi::compare<IntrusiveStripedSetHdrTest::less<base_item_type>>
+                CDS_BOOST_INTRUSIVE_KEY_OF_VALUE_OPTION( base_item_type )
+            >
             ,co::hash< IntrusiveStripedSetHdrTest::hash_int >
             ,co::resizing_policy< ci::striped_set::single_bucket_size_threshold<64> >
             ,co::mutex_policy< ci::striped_set::refinable<> >
@@ -39,7 +62,10 @@ namespace set {
     void IntrusiveStripedSetHdrTest::Refinable_avl_set_basehook_bucket_threshold_rt()
     {
         typedef ci::StripedSet<
-            bi::avl_set<base_item_type, bi::compare<IntrusiveStripedSetHdrTest::less<base_item_type> > >
+            bi::avl_set<base_item_type
+                , bi::compare<IntrusiveStripedSetHdrTest::less<base_item_type>>
+                CDS_BOOST_INTRUSIVE_KEY_OF_VALUE_OPTION( base_item_type )
+            >
             ,co::hash< IntrusiveStripedSetHdrTest::hash_int >
             ,co::resizing_policy< ci::striped_set::single_bucket_size_threshold<0> >
             ,co::mutex_policy< ci::striped_set::refinable<> >
@@ -56,6 +82,7 @@ namespace set {
                 member_item_type
                 , bi::member_hook< member_item_type, bi::avl_set_member_hook<>, &member_item_type::hMember>
                 , bi::compare<IntrusiveStripedSetHdrTest::less<member_item_type> >
+                CDS_BOOST_INTRUSIVE_KEY_OF_VALUE_OPTION( member_item_type )
             >
             ,co::mutex_policy< ci::striped_set::refinable<> >
             ,co::hash< IntrusiveStripedSetHdrTest::hash_int >
@@ -71,6 +98,7 @@ namespace set {
                 member_item_type
                 , bi::member_hook< member_item_type, bi::avl_set_member_hook<>, &member_item_type::hMember>
                 , bi::compare<IntrusiveStripedSetHdrTest::less<member_item_type> >
+                CDS_BOOST_INTRUSIVE_KEY_OF_VALUE_OPTION( member_item_type )
             >
             ,co::mutex_policy< ci::striped_set::refinable<> >
             ,co::hash< IntrusiveStripedSetHdrTest::hash_int >
@@ -87,6 +115,7 @@ namespace set {
                 member_item_type
                 , bi::member_hook< member_item_type, bi::avl_set_member_hook<>, &member_item_type::hMember>
                 , bi::compare<IntrusiveStripedSetHdrTest::less<member_item_type> >
+                CDS_BOOST_INTRUSIVE_KEY_OF_VALUE_OPTION( member_item_type )
             >
             ,co::hash< IntrusiveStripedSetHdrTest::hash_int >
             ,co::mutex_policy< ci::striped_set::refinable<> >