Fixed -Wshadow warnings

[libcds.git] / test / unit / misc / cxx11_atomic_func.cpp

diff --git a/test/unit/misc/cxx11_atomic_func.cpp b/test/unit/misc/cxx11_atomic_func.cpp
index 17eac5c1d30f2032399b6f90abe1a1ad70c78fe7..20c948f0b2332b0ab9361bc8b7f5f2bd8d341c52 100644 (file)
--- a/test/unit/misc/cxx11_atomic_func.cpp
+++ b/test/unit/misc/cxx11_atomic_func.cpp
@@ -28,7 +28,7 @@
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include <gtest/gtest.h>
+#include <cds_test/ext_gtest.h>
 #include <cds/algo/atomic.h>
 
 #ifndef CDS_USE_BOOST_ATOMIC
@@ -416,14 +416,14 @@ namespace misc {
             EXPECT_EQ( *atomics::atomic_load_explicit( &a, oLoad ), 1 );
 
             for ( integral_type i = 1; i < aSize; ++i ) {
-                integral_type * p = atomics::atomic_load_explicit( &a, oLoad );
+                p = atomics::atomic_load_explicit( &a, oLoad );
                 EXPECT_EQ( *p, i );
                 EXPECT_EQ( atomics::atomic_fetch_add_explicit( &a, 1, order ), p );
                 EXPECT_EQ( *atomics::atomic_load_explicit( &a, oLoad ), i + 1 );
             }
 
             for ( integral_type i = aSize; i > 1; --i ) {
-                integral_type * p = atomics::atomic_load_explicit( &a, oLoad );
+                p = atomics::atomic_load_explicit( &a, oLoad );
                 EXPECT_EQ( *p, i  );
                 EXPECT_EQ( atomics::atomic_fetch_sub_explicit( &a, 1, order ), p );
                 EXPECT_EQ( *atomics::atomic_load_explicit( &a, oLoad ), i - 1 );
@@ -464,14 +464,14 @@ namespace misc {
             EXPECT_EQ( *atomics::atomic_load( &a ), 1 );
 
             for ( integral_type i = 1; i < aSize; ++i ) {
-                integral_type * p = atomics::atomic_load( &a );
+                p = atomics::atomic_load( &a );
                 EXPECT_EQ( *p, i );
                 EXPECT_EQ( atomics::atomic_fetch_add( &a, 1 ), p );
                 EXPECT_EQ( *atomics::atomic_load( &a ), i + 1 );
             }
 
             for ( integral_type i = aSize; i > 1; --i ) {
-                integral_type * p = atomics::atomic_load( &a );
+                p = atomics::atomic_load( &a );
                 EXPECT_EQ( *p, i );
                 EXPECT_EQ( atomics::atomic_fetch_sub( &a, 1 ), p );
                 EXPECT_EQ( *atomics::atomic_load( &a ), i - 1 );
@@ -488,6 +488,8 @@ namespace misc {
         template <typename Atomic>
         void do_test_atomic_pointer_void_( Atomic& a, char * arr, char aSize, atomics::memory_order order )
         {
+            CDS_UNUSED( aSize );
+
             atomics::memory_order oLoad = convert_to_load_order(order);
             atomics::memory_order oStore = convert_to_store_order(order);
             char *  p;