Removed trailing spaces

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

diff --git a/cds/container/details/make_michael_kvlist.h b/cds/container/details/make_michael_kvlist.h
index 64a9d9b434323a1d79eff80ddc92bef1d0d4f58c..9de92342957480ba9fc0f7f0787c9b59aa33b6a4 100644 (file)
--- a/cds/container/details/make_michael_kvlist.h
+++ b/cds/container/details/make_michael_kvlist.h
@@ -1,7 +1,35 @@
-//$$CDS-header$$
+/*
+    This file is a part of libcds - Concurrent Data Structures library
 
-#ifndef __CDS_CONTAINER_DETAILS_MAKE_MICHAEL_KVLIST_H
-#define __CDS_CONTAINER_DETAILS_MAKE_MICHAEL_KVLIST_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_MICHAEL_KVLIST_H
+#define CDSLIB_CONTAINER_DETAILS_MAKE_MICHAEL_KVLIST_H
 
 #include <cds/details/binary_functor_wrapper.h>
 
@@ -24,9 +52,13 @@ namespace cds { namespace container {
             {
                 pair_type               m_Data;
 
+                node_type( key_type const& key )
+                    : m_Data( key, value_type() )
+                {}
+
                 template <typename Q>
                 node_type( Q const& key )
-                    : m_Data( key, value_type() )
+                    : m_Data( key_type(key), value_type() )
                 {}
 
                 template <typename Q, typename R>
@@ -34,14 +66,28 @@ namespace cds { namespace container {
                     : m_Data( pair )
                 {}
 
+                node_type( key_type const& key, value_type const& value )
+                    : m_Data( key, value )
+                {}
+
+                template <typename R>
+                node_type( key_type const& key, R const& value )
+                    : m_Data( key, value_type( value ))
+                {}
+
+                template <typename Q>
+                node_type( Q const& key, value_type const& value )
+                    : m_Data( key_type( key ), value )
+                {}
+
                 template <typename Q, typename R>
                 node_type( Q const& key, R const& value )
-                    : m_Data( key, value )
+                    : m_Data( key_type( key ), value_type( value ))
                 {}
 
                 template< typename Ky, typename... Args>
                 node_type( Ky&& key, Args&&... args )
-                    : m_Data( std::forward<Ky>(key), std::move( value_type( std::forward<Args>(args)...)))
+                    : m_Data( key_type( std::forward<Ky>(key)), std::move( value_type( std::forward<Args>(args)...)))
                 {}
             };
 
@@ -70,18 +116,19 @@ namespace cds { namespace container {
                 typedef cds::details::compare_wrapper< node_type, cds::opt::details::make_comparator_from_less<Less>, key_field_accessor >    type;
             };
 
-            struct type_traits: public original_type_traits
+            struct intrusive_traits: public original_type_traits
             {
                 typedef intrusive::michael_list::base_hook< opt::gc<gc> >  hook;
                 typedef node_deallocator                    disposer;
                 typedef cds::details::compare_wrapper< node_type, key_comparator, key_field_accessor > compare;
+                static const opt::link_check_type link_checker = intrusive::michael_list::traits::link_checker;
             };
 
-            typedef intrusive::MichaelList<gc, node_type, type_traits>  type;
+            typedef intrusive::MichaelList<gc, node_type, intrusive_traits>  type;
         };
     }   // namespace details
     //@endcond
 
 }}  // namespace cds::container
 
-#endif  // #ifndef __CDS_CONTAINER_DETAILS_MAKE_MICHAEL_KVLIST_H
+#endif  // #ifndef CDSLIB_CONTAINER_DETAILS_MAKE_MICHAEL_KVLIST_H