From: khizmax <khizmax@gmail.com>
Date: Fri, 22 Sep 2017 06:23:04 +0000 (+0300)
Subject: Fixed -Wshadow warning
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7dfac7ccae1aa24f28655e3380293dc1f67ea7b2;p=libcds.git

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 951f5e7f..9508c24a 100644
--- 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 61786701..bc24ff6d 100644
--- 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>