Bugfix

diff --git a/cds/intrusive/details/michael_set_base.h b/cds/intrusive/details/michael_set_base.h
index c7bfdb282a31c7ef35a12f32e1cde11f532d23fc..a2b7573489123045a57c7c563f6d8ccb8b2b724e 100644 (file)
--- 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;
 
                 list_iterator   m_itList;
                 bucket_ptr      m_pEndBucket;
 

-                friend class iterator < bucket_type, !IsConst > ;
-

                 void next()
                 {
                     if ( m_pCurBucket < m_pEndBucket ) {
                 void next()
                 {
                     if ( m_pCurBucket < m_pEndBucket ) {

diff --git a/tests/unit/map2/map_types.h b/tests/unit/map2/map_types.h
index c4cf5b2ee0d436ff0f8c8806c932d6327d63e166..ad26026f2fd4a1b687565042c0fa2110996585af 100644 (file)
--- 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_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 :
 #endif
 
         struct SplitList_Lazy_dyn_cmp_seqcst :