From 755e340bdd34d88c52e7aa4f1b08395c3cdca816 Mon Sep 17 00:00:00 2001 From: khizmax Date: Mon, 14 Nov 2016 16:50:45 +0300 Subject: [PATCH 1/1] Fixed explicit ctor bugs in stress tests --- test/stress/map/map_type_feldman_hashmap.h | 6 +++--- test/stress/set/insdel_find/set_insdelfind.h | 2 ++ test/stress/set/set_type_std.h | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/test/stress/map/map_type_feldman_hashmap.h b/test/stress/map/map_type_feldman_hashmap.h index fabf3769..c6026064 100644 --- a/test/stress/map/map_type_feldman_hashmap.h +++ b/test/stress/map/map_type_feldman_hashmap.h @@ -75,8 +75,8 @@ namespace map { struct traits_FeldmanHashMap_stdhash : public cc::feldman_hashmap::traits { - typedef std::hash< Key > hash; - typedef map::cmp compare; + typedef std::hash< Key > hash; + typedef std::less less; }; typedef FeldmanHashMap< cds::gc::HP, Key, Value, traits_FeldmanHashMap_stdhash > FeldmanHashMap_hp_stdhash; @@ -92,7 +92,7 @@ namespace map { struct traits_FeldmanHashMap_stdhash_stat: traits_FeldmanHashMap_stdhash { typedef cc::feldman_hashmap::stat<> stat; - typedef map::less less; + typedef std::less less; }; typedef FeldmanHashMap< cds::gc::HP, Key, Value, traits_FeldmanHashMap_stdhash_stat > FeldmanHashMap_hp_stdhash_stat; diff --git a/test/stress/set/insdel_find/set_insdelfind.h b/test/stress/set/insdel_find/set_insdelfind.h index 5989ba49..a8778307 100644 --- a/test/stress/set/insdel_find/set_insdelfind.h +++ b/test/stress/set/insdel_find/set_insdelfind.h @@ -107,6 +107,8 @@ namespace set { unsigned int i = 0; size_t const nNormalize = size_t(-1) / ( fixture.s_nSetSize * 2); + typedef typename Set::value_type value_type; + size_t nRand = 0; while ( !time_elapsed()) { nRand = cds::bitop::RandXorShift(nRand); diff --git a/test/stress/set/set_type_std.h b/test/stress/set/set_type_std.h index 54e265c9..c4481cf4 100644 --- a/test/stress/set/set_type_std.h +++ b/test/stress/set/set_type_std.h @@ -164,10 +164,11 @@ namespace set { return base_class::find( v ) != base_class::end(); } - bool insert( value_type const& v ) + template + bool insert( Key const& k ) { scoped_lock al( m_lock ); - return base_class::insert( v ).second; + return base_class::insert( value_type( k )).second; } template -- 2.34.1