From bc10f85a86a3d556d7e06521891ad8641548f9c2 Mon Sep 17 00:00:00 2001 From: khizmax Date: Wed, 3 Aug 2016 13:07:51 +0300 Subject: [PATCH] Fixed explicit ctor stuff --- cds/container/impl/iterable_kvlist.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/cds/container/impl/iterable_kvlist.h b/cds/container/impl/iterable_kvlist.h index d3b2de37..07087f1e 100644 --- a/cds/container/impl/iterable_kvlist.h +++ b/cds/container/impl/iterable_kvlist.h @@ -123,9 +123,9 @@ namespace cds { namespace container { public: #ifdef CDS_DOXYGEN_INVOKED - typedef Key key_type ; ///< Key type - typedef Value mapped_type ; ///< Type of value stored in the list - typedef std::pair value_type ; ///< key/value pair stored in the list + typedef Key key_type; ///< Key type + typedef Value mapped_type; ///< Type of value stored in the list + typedef std::pair value_type; ///< key/value pair stored in the list #else typedef typename maker::key_type key_type; typedef typename maker::mapped_type mapped_type; @@ -303,7 +303,7 @@ namespace cds { namespace container { template bool insert_with( K const& key, Func func ) { - return base_class::insert( value_type( key, mapped_type()), func ); + return base_class::insert( value_type( key_type( key ), mapped_type()), func ); } /// Updates data by \p key @@ -337,7 +337,7 @@ namespace cds { namespace container { template std::pair update( K const& key, Func f, bool bAllowInsert = true ) { - return base_class::update( value_type( key, mapped_type()), f, bAllowInsert ); + return base_class::update( value_type( key_type( key ), mapped_type()), f, bAllowInsert ); } /// Insert or update @@ -650,21 +650,21 @@ namespace cds { namespace container { // Split-list support template - bool insert_at( head_type& refHead, const K& key ) + bool insert_at( head_type& refHead, K const& key ) { - return base_class::insert_at( refHead, value_type( key, mapped_type() )); + return base_class::insert_at( refHead, value_type( key_type( key ), mapped_type() )); } template - bool insert_at( head_type& refHead, const K& key, const V& val ) + bool insert_at( head_type& refHead, const K& key, V const& val ) { - return base_class::insert_at( refHead, value_type( key, val )); + return base_class::insert_at( refHead, value_type( key_type( key ), val )); } template - bool insert_with_at( head_type& refHead, const K& key, Func f ) + bool insert_with_at( head_type& refHead, K const& key, Func f ) { - return base_class::insert_at( refHead, value_type( key, mapped_type()), f ); + return base_class::insert_at( refHead, value_type( key_type( key ), mapped_type()), f ); } template @@ -676,7 +676,7 @@ namespace cds { namespace container { template std::pair update_at( head_type& refHead, const K& key, Func f, bool bAllowInsert ) { - return base_class::update_at( refHead, value_type( key, mapped_type()), f, bAllowInsert ); + return base_class::update_at( refHead, value_type( key_type( key ), mapped_type()), f, bAllowInsert ); } template -- 2.34.1