Added copyright and license

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

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 2e796b2f012e8ef20ccb354c67eb947642af6607..286836b2842185973057989f90a1c2200a647502 100644 (file)
--- a/tests/test-hdr/set/hdr_intrusive_striped_hashset_splayset.cpp
+++ b/tests/test-hdr/set/hdr_intrusive_striped_hashset_splayset.cpp
@@ -1,8 +1,37 @@
-//$$CDS-header$$
+/*
+    This file is a part of libcds - Concurrent Data Structures library
+
+    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016
+
+    Source code repo: http://github.com/khizmax/libcds/
+    Download: http://sourceforge.net/projects/libcds/files/
+    
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, this
+      list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+    OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.     
+*/
 
 #include "set/hdr_intrusive_striped_set.h"
 #include <cds/intrusive/striped_set/boost_splay_set.h>
 #include <cds/intrusive/striped_set.h>
+#include <boost/version.hpp>
 
 namespace set {
     namespace bi = boost::intrusive;
@@ -12,18 +41,39 @@ namespace set {
         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;
+        typedef bi::bs_set_base_hook<> splay_set_base_hook;
+        typedef bi::bs_set_member_hook<> splay_set_member_hook;
 #endif
 
         typedef IntrusiveStripedSetHdrTest::base_item< splay_set_base_hook> base_item_type;
         typedef IntrusiveStripedSetHdrTest::member_item< splay_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::Striped_splay_set_basehook()
     {
         typedef ci::StripedSet<
-            bi::splay_set<base_item_type, bi::compare<IntrusiveStripedSetHdrTest::less<base_item_type> > >
+            bi::splay_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::mutex_policy< ci::striped_set::striping<> >
         > set_type;
@@ -34,7 +84,10 @@ namespace set {
     void IntrusiveStripedSetHdrTest::Striped_splay_set_basehook_bucket_threshold()
     {
         typedef ci::StripedSet<
-            bi::splay_set<base_item_type, bi::compare<IntrusiveStripedSetHdrTest::less<base_item_type> > >
+            bi::splay_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> >
         > set_type;
@@ -45,7 +98,10 @@ namespace set {
     void IntrusiveStripedSetHdrTest::Striped_splay_set_basehook_bucket_threshold_rt()
     {
         typedef ci::StripedSet<
-            bi::splay_set<base_item_type, bi::compare<IntrusiveStripedSetHdrTest::less<base_item_type> > >
+            bi::splay_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> >
         > set_type;
@@ -61,6 +117,7 @@ namespace set {
                 member_item_type
                 , bi::member_hook< member_item_type, splay_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 >
         > set_type;
@@ -74,7 +131,8 @@ namespace set {
             bi::splay_set<
                 member_item_type
                 , bi::member_hook< member_item_type, splay_set_member_hook, &member_item_type::hMember>
-                , bi::compare<IntrusiveStripedSetHdrTest::less<member_item_type> >
+                , bi::compare<IntrusiveStripedSetHdrTest::less<member_item_type>>
+                CDS_BOOST_INTRUSIVE_KEY_OF_VALUE_OPTION( member_item_type )
             >
             ,co::hash< IntrusiveStripedSetHdrTest::hash_int >
             ,co::resizing_policy< ci::striped_set::single_bucket_size_threshold<256> >
@@ -89,7 +147,8 @@ namespace set {
             bi::splay_set<
                 member_item_type
                 , bi::member_hook< member_item_type, splay_set_member_hook, &member_item_type::hMember>
-                , bi::compare<IntrusiveStripedSetHdrTest::less<member_item_type> >
+                , bi::compare<IntrusiveStripedSetHdrTest::less<member_item_type>>
+                CDS_BOOST_INTRUSIVE_KEY_OF_VALUE_OPTION( member_item_type )
             >
             ,co::hash< IntrusiveStripedSetHdrTest::hash_int >
             ,co::resizing_policy< ci::striped_set::single_bucket_size_threshold<0> >