Fixed -Wshadow warnings

[libcds.git] / test / include / cds_test / thread.h

diff --git a/test/include/cds_test/thread.h b/test/include/cds_test/thread.h
index a56987adf34fb89efdcd81b40ab6fb582dd7a5d0..51fc399a200ca3157a06be83d2a96cbb681c60a4 100644 (file)
--- a/test/include/cds_test/thread.h
+++ b/test/include/cds_test/thread.h
@@ -1,7 +1,7 @@
 /*
     This file is a part of libcds - Concurrent Data Structures library
 
-    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016
+    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2017
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
@@ -31,7 +31,7 @@
 #ifndef CDSTEST_THREAD_H
 #define CDSTEST_THREAD_H
 
-#include <gtest/gtest.h>
+#include <cds_test/ext_gtest.h>
 #include <vector>
 #include <thread>
 #include <condition_variable>
@@ -156,8 +156,8 @@ namespace cds_test {
         };
 
     public:
-        explicit thread_pool( ::testing::Test& fixture )
-            : m_fixture( fixture )
+        explicit thread_pool( ::testing::Test& fx )
+            : m_fixture( fx )
             , m_bTimeElapsed( false )
         {}
 
@@ -192,7 +192,7 @@ namespace cds_test {
 
             // Create threads
             std::vector< std::thread > threads;
-            threads.reserve( m_workers.size() );
+            threads.reserve( m_workers.size());
             for ( auto w : m_workers )
                 threads.emplace_back( &thread::run, w );