Changed algorithm of IterableList detecting

[libcds.git] / cds / container / details / make_skip_list_set.h

diff --git a/cds/container/details/make_skip_list_set.h b/cds/container/details/make_skip_list_set.h
index 7f7392afeea1421a317d976235961a1fdbd42947..d65cd13e5c220c171cb1b437f88d5eba7a7fb232 100644 (file)
--- a/cds/container/details/make_skip_list_set.h
+++ b/cds/container/details/make_skip_list_set.h
@@ -1,7 +1,35 @@
-//$$CDS-header$$
+/*
+    This file is a part of libcds - Concurrent Data Structures library
 
-#ifndef __CDS_CONTAINER_DETAILS_MAKE_SKIP_LIST_SET_H
-#define __CDS_CONTAINER_DETAILS_MAKE_SKIP_LIST_SET_H
+    (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.
+*/
+
+#ifndef CDSLIB_CONTAINER_DETAILS_MAKE_SKIP_LIST_SET_H
+#define CDSLIB_CONTAINER_DETAILS_MAKE_SKIP_LIST_SET_H
 
 #include <cds/container/details/skip_list_base.h>
 #include <cds/details/binary_functor_wrapper.h>
@@ -14,7 +42,7 @@ namespace cds { namespace container { namespace details {
     {
         typedef GC      gc;
         typedef T       value_type;
-        typedef Traits  type_traits;
+        typedef Traits  traits;
 
         typedef cds::intrusive::skip_list::node< gc >   intrusive_node_type;
         struct node_type: public intrusive_node_type
@@ -50,7 +78,7 @@ namespace cds { namespace container { namespace details {
             node_type() ;   // no default ctor
         };
 
-        typedef skip_list::details::node_allocator< node_type, type_traits> node_allocator;
+        typedef skip_list::details::node_allocator< node_type, traits> node_allocator;
 
         struct node_deallocator {
             void operator ()( node_type * pNode )
@@ -68,15 +96,15 @@ namespace cds { namespace container { namespace details {
                 return node.m_Value;
             }
         };
-        typedef typename opt::details::make_comparator< value_type, type_traits >::type key_comparator;
+        typedef typename opt::details::make_comparator< value_type, traits >::type key_comparator;
 
         template <typename Less>
         struct less_wrapper {
             typedef cds::details::compare_wrapper< node_type, cds::opt::details::make_comparator_from_less<Less>, value_accessor >    type;
         };
 
-        class intrusive_type_traits: public cds::intrusive::skip_list::make_traits<
-            cds::opt::type_traits< type_traits >
+        class intrusive_traits: public cds::intrusive::skip_list::make_traits<
+            cds::opt::type_traits< traits >
             ,cds::intrusive::opt::hook< intrusive::skip_list::base_hook< cds::opt::gc< gc > > >
             ,cds::intrusive::opt::disposer< node_deallocator >
             ,cds::intrusive::skip_list::internal_node_builder< dummy_node_builder >
@@ -84,9 +112,9 @@ namespace cds { namespace container { namespace details {
         >::type
         {};
 
-        typedef cds::intrusive::SkipListSet< gc, node_type, intrusive_type_traits>   type;
+        typedef cds::intrusive::SkipListSet< gc, node_type, intrusive_traits>   type;
     };
 }}} // namespace cds::container::details
 //@endcond
 
-#endif //#ifndef __CDS_CONTAINER_DETAILS_MAKE_SKIP_LIST_SET_H
+#endif //#ifndef CDSLIB_CONTAINER_DETAILS_MAKE_SKIP_LIST_SET_H