-//$$CDS-header$$
+/*
+ This file is a part of libcds - Concurrent Data Structures library
+
+ (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2017
+
+ 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_LAZY_KVLIST_H
#define CDSLIB_CONTAINER_DETAILS_MAKE_LAZY_KVLIST_H
{
value_type m_Data;
+ node_type( key_type const& key )
+ : m_Data( key, mapped_type())
+ {}
+
template <typename Q>
node_type( Q const& key )
- : m_Data( key, mapped_type() )
+ : m_Data( key_type( key ), mapped_type())
{}
template <typename Q, typename R>
: m_Data( pair )
{}
+ node_type( key_type const& key, mapped_type const& value )
+ : m_Data( key, value )
+ {}
+
+ template <typename R>
+ node_type( key_type const& key, R const& value )
+ : m_Data( key, mapped_type( value ))
+ {}
+
+ template <typename Q>
+ node_type( Q const& key, mapped_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 ), mapped_type( value ))
{}
template <typename Ky, typename... Args>
node_type( Ky&& key, Args&&... args )
- : m_Data( std::forward<Ky>( key ), std::move( mapped_type( std::forward<Args>( args )... ) ) )
+ : m_Data( key_type( std::forward<Ky>( key )), std::move( mapped_type( std::forward<Args>( args )... )))
{}
};
struct intrusive_traits: public original_type_traits
{
- typedef intrusive::lazy_list::base_hook< opt::gc<gc> > hook;
+ typedef intrusive::lazy_list::base_hook< opt::gc<gc>, opt::lock_type< typename original_type_traits::lock_type >> hook;
typedef node_deallocator disposer;
typedef typename std::conditional< std::is_same< typename original_type_traits::equal_to, cds::opt::none >::value,
typename equal_to_wrapper< typename original_type_traits::equal_to >::type
>::type equal_to;
- typedef typename std::conditional< original_type_traits::sort,
- cds::details::compare_wrapper< node_type, key_comparator, key_field_accessor >,
+ typedef typename std::conditional<
+ original_type_traits::sort
+ || !std::is_same< typename original_type_traits::compare, cds::opt::none >::value
+ || !std::is_same< typename original_type_traits::less, cds::opt::none >::value,
+ cds::details::compare_wrapper<
+ node_type,
+ typename opt::details::make_comparator< value_type, original_type_traits >::type,
+ key_field_accessor
+ >,
cds::opt::none
>::type compare;