Fixed -Wshadow warning
authorkhizmax <khizmax@gmail.com>
Fri, 22 Sep 2017 06:23:04 +0000 (09:23 +0300)
committerkhizmax <khizmax@gmail.com>
Fri, 22 Sep 2017 06:23:04 +0000 (09:23 +0300)
Revert "Try to suppress -Wshadow warnings for googletest"
This reverts commit 61f52828c665db74baa27010499a65f56da03754.

cds/intrusive/cuckoo_set.h
test/include/cds_test/ext_gtest.h

index 951f5e7..9508c24 100644 (file)
@@ -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 ];
 
index 6178670..bc24ff6 100644 (file)
@@ -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>