Fixed GCC warnings

diff --git a/test/stress/set/iter_erase/set_iter_erase.h b/test/stress/set/iter_erase/set_iter_erase.h
index 5ab5acfe9eeb8f30432b65dc558d76c05a66a68c..9537c6863ce976a5e8193e6f8b075fdb6e735322 100644 (file)
--- a/test/stress/set/iter_erase/set_iter_erase.h
+++ b/test/stress/set/iter_erase/set_iter_erase.h
@@ -362,12 +362,11 @@ namespace set {
             {
                 Set& rSet = m_Set;
 
             {
                 Set& rSet = m_Set;
 

-                size_t const nInsThreadCount = s_nInsThreadCount;

                 Set_Iter_Del3& fixture = pool().template fixture<Set_Iter_Del3>();
 
                 do {
                 Set_Iter_Del3& fixture = pool().template fixture<Set_Iter_Del3>();
 
                 do {

-                    auto itEnd = rSet.get_end<Iterator>();
-                    for ( auto it = rSet.get_begin<Iterator>(); it != itEnd; ++it ) {
+                    auto itEnd = rSet.template get_end<Iterator>();
+                    for ( auto it = rSet.template get_begin<Iterator>(); it != itEnd; ++it ) {

                         if ( it->key.nKey & 3 ) {
                             if ( rSet.erase_at( it ))
                                 ++m_nDeleteSuccess;
                         if ( it->key.nKey & 3 ) {
                             if ( rSet.erase_at( it ))
                                 ++m_nDeleteSuccess;

diff --git a/test/stress/set/set_type_feldman_hashset.h b/test/stress/set/set_type_feldman_hashset.h
index c88b4c0b67828387fb8a9fdba73fef4df915a223..2822911a66bbc7e64a2c5094e6800f05654f2633 100644 (file)
--- a/test/stress/set/set_type_feldman_hashset.h
+++ b/test/stress/set/set_type_feldman_hashset.h
@@ -47,7 +47,8 @@ namespace set {
     {
         typedef cc::FeldmanHashSet< GC, T, Traits > base_class;
 
     {
         typedef cc::FeldmanHashSet< GC, T, Traits > base_class;
 

-        template <typename GC>
+        
+        template <typename GC2>

         struct get_extracted_ptr
         {
             typedef typename base_class::guarded_ptr extracted_ptr;
         struct get_extracted_ptr
         {
             typedef typename base_class::guarded_ptr extracted_ptr;


@@ -418,7 +419,7 @@ namespace set {
     CDSSTRESS_FeldmanHashSet_case( fixture, test_case, FeldmanHashSet_rcu_gpb_fixed_stat,   key_type, value_type ) \
     CDSSTRESS_FeldmanHashSet_case( fixture, test_case, FeldmanHashSet_rcu_gpt_fixed_stat,   key_type, value_type ) \
 
     CDSSTRESS_FeldmanHashSet_case( fixture, test_case, FeldmanHashSet_rcu_gpb_fixed_stat,   key_type, value_type ) \
     CDSSTRESS_FeldmanHashSet_case( fixture, test_case, FeldmanHashSet_rcu_gpt_fixed_stat,   key_type, value_type ) \
 

-    //CDSSTRESS_FeldmanHashSet_fixed_SHRCU( fixture, test_case, key_type, value_type ) \
+  //CDSSTRESS_FeldmanHashSet_fixed_SHRCU( fixture, test_case, key_type, value_type )

 
 #define CDSSTRESS_FeldmanHashSet_fixed_HP( fixture, test_case, key_type, value_type ) \
     CDSSTRESS_FeldmanHashSet_case( fixture, test_case, FeldmanHashSet_hp_fixed,             key_type, value_type ) \
 
 #define CDSSTRESS_FeldmanHashSet_fixed_HP( fixture, test_case, key_type, value_type ) \
     CDSSTRESS_FeldmanHashSet_case( fixture, test_case, FeldmanHashSet_hp_fixed,             key_type, value_type ) \