Removed redundant spaces

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

diff --git a/cds/container/details/make_skip_list_map.h b/cds/container/details/make_skip_list_map.h
index ae87e8a36f75180f1c66fccbfad64b5b40f93069..cc34b391e3e7ccbe3f70938d2839bf699835ba6e 100644 (file)
--- a/cds/container/details/make_skip_list_map.h
+++ b/cds/container/details/make_skip_list_map.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_MAP_H
-#define __CDS_CONTAINER_DETAILS_MAKE_SKIP_LIST_MAP_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_MAP_H
+#define CDSLIB_CONTAINER_DETAILS_MAKE_SKIP_LIST_MAP_H
 
 #include <cds/container/details/skip_list_base.h>
 #include <cds/details/binary_functor_wrapper.h>
@@ -16,7 +44,7 @@ namespace cds { namespace container { namespace details {
         typedef K       key_type;
         typedef T       mapped_type;
         typedef std::pair< key_type const, mapped_type> 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
@@ -30,7 +58,7 @@ namespace cds { namespace container { namespace details {
 
             template <typename Q>
             node_type( unsigned int nHeight, atomic_marked_ptr * pTower, Q const& key )
-                : m_Value( std::make_pair( key, mapped_type() ))
+                : m_Value( std::make_pair( key, mapped_type()))
             {
                 init_tower( nHeight, pTower );
             }
@@ -49,9 +77,9 @@ namespace cds { namespace container { namespace details {
                 init_tower( nHeight, pTower );
             }
 
-        private:
-            node_type() ;   // no default ctor
+            node_type() = delete;
 
+        private:
             void init_tower( unsigned int nHeight, atomic_marked_ptr * pTower )
             {
                 if ( nHeight > 1 ) {
@@ -61,14 +89,14 @@ namespace cds { namespace container { namespace details {
             }
         };
 
-        class node_allocator: public skip_list::details::node_allocator< node_type, type_traits>
+        class node_allocator : public skip_list::details::node_allocator< node_type, traits>
         {
-            typedef skip_list::details::node_allocator< node_type, type_traits> base_class;
+            typedef skip_list::details::node_allocator< node_type, traits> base_class;
         public:
             template <typename Q>
             node_type * New( unsigned int nHeight, Q const& key )
             {
-                return base_class::New( nHeight, key );
+                return base_class::New( nHeight, key_type( key ));
             }
             template <typename Q, typename U>
             node_type * New( unsigned int nHeight, Q const& key, U const& val )
@@ -77,7 +105,7 @@ namespace cds { namespace container { namespace details {
                 return new( pMem )
                     node_type( nHeight,
                         nHeight > 1 ? reinterpret_cast<typename base_class::node_tower_item *>( pMem + base_class::c_nNodeSize ) : nullptr,
-                        key, val
+                        key_type( key ), mapped_type( val )
                     );
             }
             template <typename... Args>
@@ -108,10 +136,10 @@ namespace cds { namespace container { namespace details {
                 return node.m_Value.first;
             }
         };
-        typedef typename opt::details::make_comparator< key_type, type_traits >::type key_comparator;
+        typedef typename opt::details::make_comparator< key_type, traits >::type key_comparator;
 
         class intrusive_type_traits: public cds::intrusive::skip_list::make_traits<
-            cds::opt::type_traits< type_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 >
@@ -125,4 +153,4 @@ namespace cds { namespace container { namespace details {
 }}} // namespace cds::container::details
 //@endcond
 
-#endif // __CDS_CONTAINER_DETAILS_MAKE_SKIP_LIST_MAP_H
+#endif // CDSLIB_CONTAINER_DETAILS_MAKE_SKIP_LIST_MAP_H