From 3ca9b8c15b883abdce96113ee75ccfd2ad00ddc6 Mon Sep 17 00:00:00 2001 From: khizmax Date: Thu, 30 Oct 2014 00:48:54 +0300 Subject: [PATCH] Fix GCC build --- cds/container/michael_kvlist_rcu.h | 23 ++++++++++--------- projects/source.test-hdr.mk | 2 +- projects/source.test-hdr.offsetof.mk | 2 +- .../ordered_list/hdr_michael_kv_rcu_shb.cpp | 8 +++---- .../ordered_list/hdr_michael_kv_rcu_sht.cpp | 8 +++---- 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/cds/container/michael_kvlist_rcu.h b/cds/container/michael_kvlist_rcu.h index b7fc1ad2..7783fb8d 100644 --- a/cds/container/michael_kvlist_rcu.h +++ b/cds/container/michael_kvlist_rcu.h @@ -92,23 +92,24 @@ namespace cds { namespace container { //@endcond public: + typedef cds::urcu::gc gc; ///< Garbage collector + #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::value_type mapped_type; - typedef typename maker::pair_type value_type; + typedef typename maker::key_type key_type; + typedef typename maker::value_type mapped_type; + typedef typename maker::pair_type value_type; #endif - typename Traits traits; ///< List traits + typedef Traits traits; ///< List traits - typedef typename base_class::gc gc ; ///< Garbage collector used - typedef typename base_class::back_off back_off ; ///< Back-off strategy used + typedef typename base_class::back_off back_off; ///< Back-off strategy typedef typename maker::allocator_type allocator_type; ///< Allocator type used for allocate/deallocate the nodes - typedef typename base_class::item_counter item_counter ; ///< Item counting policy used + typedef typename base_class::item_counter item_counter; ///< Item counting policy typedef typename maker::key_comparator key_comparator; ///< key comparison functor - typedef typename base_class::memory_model memory_model ; ///< Memory ordering. See cds::opt::memory_model option + typedef typename base_class::memory_model memory_model; ///< Memory ordering. See \p michael_list::traits::memory_model typedef typename base_class::rcu_check_deadlock rcu_check_deadlock ; ///< RCU deadlock checking policy typedef typename gc::scoped_lock rcu_lock ; ///< RCU scoped lock diff --git a/projects/source.test-hdr.mk b/projects/source.test-hdr.mk index 76148cea..f16cb384 100644 --- a/projects/source.test-hdr.mk +++ b/projects/source.test-hdr.mk @@ -180,7 +180,7 @@ CDS_TESTHDR_SET := \ tests/test-hdr/set/hdr_refinable_hashset_slist.cpp \ tests/test-hdr/set/hdr_refinable_hashset_vector.cpp \ tests/test-hdr/set/hdr_skiplist_set_hp.cpp \ - tests/test-hdr/set/hdr_skiplist_set_dhp.cpp \ + tests/test-hdr/set/hdr_skiplist_set_ptb.cpp \ tests/test-hdr/set/hdr_skiplist_set_rcu_gpi.cpp \ tests/test-hdr/set/hdr_skiplist_set_rcu_gpb.cpp \ tests/test-hdr/set/hdr_skiplist_set_rcu_gpt.cpp \ diff --git a/projects/source.test-hdr.offsetof.mk b/projects/source.test-hdr.offsetof.mk index b9a06829..84fce3de 100644 --- a/projects/source.test-hdr.offsetof.mk +++ b/projects/source.test-hdr.offsetof.mk @@ -24,7 +24,7 @@ CDS_TESTHDR_OFFSETOF_SET := \ tests/test-hdr/set/hdr_intrusive_michael_set_rcu_shb_lazy.cpp \ tests/test-hdr/set/hdr_intrusive_michael_set_rcu_sht_lazy.cpp \ tests/test-hdr/set/hdr_intrusive_skiplist_hp_member.cpp \ - tests/test-hdr/set/hdr_intrusive_skiplist_dhp_member.cpp \ + tests/test-hdr/set/hdr_intrusive_skiplist_ptb_member.cpp \ tests/test-hdr/set/hdr_intrusive_skiplist_rcu_gpi_member.cpp \ tests/test-hdr/set/hdr_intrusive_skiplist_rcu_gpb_member.cpp \ tests/test-hdr/set/hdr_intrusive_skiplist_rcu_gpt_member.cpp \ diff --git a/tests/test-hdr/ordered_list/hdr_michael_kv_rcu_shb.cpp b/tests/test-hdr/ordered_list/hdr_michael_kv_rcu_shb.cpp index 1ee3be5f..21f65ae3 100644 --- a/tests/test-hdr/ordered_list/hdr_michael_kv_rcu_shb.cpp +++ b/tests/test-hdr/ordered_list/hdr_michael_kv_rcu_shb.cpp @@ -8,7 +8,7 @@ namespace ordlist { #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED namespace { typedef cds::urcu::gc< cds::urcu::signal_buffered<> > rcu_type; - struct RCU_SHB_cmp_traits: public cc::michael_list::type_traits + struct RCU_SHB_cmp_traits: public cc::michael_list::traits { typedef MichaelKVListTestHeader::cmp compare; }; @@ -34,7 +34,7 @@ namespace ordlist { #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED namespace { - struct RCU_SHB_less_traits: public cc::michael_list::type_traits + struct RCU_SHB_less_traits: public cc::michael_list::traits { typedef MichaelKVListTestHeader::lt less; }; @@ -60,7 +60,7 @@ namespace ordlist { #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED namespace { - struct RCU_SHB_cmpmix_traits: public cc::michael_list::type_traits + struct RCU_SHB_cmpmix_traits: public cc::michael_list::traits { typedef MichaelKVListTestHeader::cmp compare; typedef MichaelKVListTestHeader::lt less; @@ -88,7 +88,7 @@ namespace ordlist { #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED namespace { - struct RCU_SHB_ic_traits: public cc::michael_list::type_traits + struct RCU_SHB_ic_traits: public cc::michael_list::traits { typedef MichaelKVListTestHeader::lt less; typedef cds::atomicity::item_counter item_counter; diff --git a/tests/test-hdr/ordered_list/hdr_michael_kv_rcu_sht.cpp b/tests/test-hdr/ordered_list/hdr_michael_kv_rcu_sht.cpp index f7a069ba..360fe14c 100644 --- a/tests/test-hdr/ordered_list/hdr_michael_kv_rcu_sht.cpp +++ b/tests/test-hdr/ordered_list/hdr_michael_kv_rcu_sht.cpp @@ -8,7 +8,7 @@ namespace ordlist { #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED namespace { typedef cds::urcu::gc< cds::urcu::signal_threaded<> > rcu_type; - struct RCU_SHT_cmp_traits: public cc::michael_list::type_traits + struct RCU_SHT_cmp_traits: public cc::michael_list::traits { typedef MichaelKVListTestHeader::cmp compare; }; @@ -34,7 +34,7 @@ namespace ordlist { #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED namespace { - struct RCU_SHT_less_traits: public cc::michael_list::type_traits + struct RCU_SHT_less_traits: public cc::michael_list::traits { typedef MichaelKVListTestHeader::lt less; }; @@ -60,7 +60,7 @@ namespace ordlist { #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED namespace { - struct RCU_SHT_cmpmix_traits: public cc::michael_list::type_traits + struct RCU_SHT_cmpmix_traits: public cc::michael_list::traits { typedef MichaelKVListTestHeader::cmp compare; typedef MichaelKVListTestHeader::lt less; @@ -88,7 +88,7 @@ namespace ordlist { #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED namespace { - struct RCU_SHT_ic_traits: public cc::michael_list::type_traits + struct RCU_SHT_ic_traits: public cc::michael_list::traits { typedef MichaelKVListTestHeader::lt less; typedef cds::atomicity::item_counter item_counter; -- 2.34.1