Fixed -Wshadow warning

Revert "Try to suppress -Wshadow warnings for googletest"
This reverts commit 61f52828c665db74baa27010499a65f56da03754.

diff --git a/cds/intrusive/cuckoo_set.h b/cds/intrusive/cuckoo_set.h
index 951f5e7fd652f5d4e5f00d0be28b0986b6815469..9508c24ae861125e95c812d87663d10fcbccd293 100644 (file)
--- a/cds/intrusive/cuckoo_set.h
+++ b/cds/intrusive/cuckoo_set.h
@@ -2171,7 +2171,6 @@ namespace cds { namespace intrusive {
                 memcpy( pOldTable, m_BucketTable, sizeof(pOldTable));
                 allocate_bucket_tables( nCapacity );
 
-                typedef typename bucket_entry::iterator bucket_iterator;
                 hash_array arrHash;
                 position arrPos[ c_nArity ];
 

diff --git a/test/include/cds_test/ext_gtest.h b/test/include/cds_test/ext_gtest.h
index 617867015fbc991a21f106e4fc125021bd824330..bc24ff6d894b8e30e8d9f7463315c004903fe4cf 100644 (file)
--- a/test/include/cds_test/ext_gtest.h
+++ b/test/include/cds_test/ext_gtest.h
@@ -36,7 +36,6 @@
 #   pragma GCC diagnostic push
     // Unfortunately, seems, -Wduplicated-branches cannot be controlled via this pragma
 #   pragma GCC diagnostic ignored "-Wduplicated-branches"
-#   pragma GCC diagnostic ignored "-Wshadow"
 #endif
 
 #include <gtest/gtest.h>