From 0d88192bd1d09695642ad52b04f8e6424c6781f3 Mon Sep 17 00:00:00 2001 From: khizmax Date: Sat, 1 Nov 2014 08:12:45 +0300 Subject: [PATCH] Bugfix --- cds/intrusive/details/michael_set_base.h | 2 -- tests/unit/map2/map_types.h | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cds/intrusive/details/michael_set_base.h b/cds/intrusive/details/michael_set_base.h index c7bfdb28..a2b75734 100644 --- a/cds/intrusive/details/michael_set_base.h +++ b/cds/intrusive/details/michael_set_base.h @@ -103,8 +103,6 @@ namespace cds { namespace intrusive { list_iterator m_itList; bucket_ptr m_pEndBucket; - friend class iterator < bucket_type, !IsConst > ; - void next() { if ( m_pCurBucket < m_pEndBucket ) { diff --git a/tests/unit/map2/map_types.h b/tests/unit/map2/map_types.h index c4cf5b2e..ad26026f 100644 --- a/tests/unit/map2/map_types.h +++ b/tests/unit/map2/map_types.h @@ -930,8 +930,8 @@ namespace map2 { typedef cc::SplitListMap< rcu_gpb, Key, Value, SplitList_Lazy_dyn_cmp_stat > SplitList_Lazy_RCU_GPB_dyn_cmp_stat; typedef cc::SplitListMap< rcu_gpt, Key, Value, SplitList_Lazy_dyn_cmp_stat > SplitList_Lazy_RCU_GPT_dyn_cmp_stat; #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED - typedef cc::SplitListMap< rcu_shb, Key, Value, SplitList_Lazy_dyn_cmp_stat > SplitList_Lazy_RCU_SHB_dyn_cmp; - typedef cc::SplitListMap< rcu_sht, Key, Value, SplitList_Lazy_dyn_cmp_stat > SplitList_Lazy_RCU_SHT_dyn_cmp; + typedef cc::SplitListMap< rcu_shb, Key, Value, SplitList_Lazy_dyn_cmp_stat > SplitList_Lazy_RCU_SHB_dyn_cmp_stat; + typedef cc::SplitListMap< rcu_sht, Key, Value, SplitList_Lazy_dyn_cmp_stat > SplitList_Lazy_RCU_SHT_dyn_cmp_stat; #endif struct SplitList_Lazy_dyn_cmp_seqcst : -- 2.34.1