Fixed minor warnings

diff --git a/test/stress/queue/intrusive_push_pop.cpp b/test/stress/queue/intrusive_push_pop.cpp
index eede7abdac4a838739b044001ebb40a6afb9bae5..b30e398c24194b6c95822eb385b835c805ee660f 100644 (file)
--- a/test/stress/queue/intrusive_push_pop.cpp
+++ b/test/stress/queue/intrusive_push_pop.cpp
@@ -509,8 +509,21 @@ namespace {
     //CDSSTRESS_QUEUE_F( SegmentedQueue_DHP_mutex_padding )
     CDSSTRESS_QUEUE_F( SegmentedQueue_DHP_mutex_stat )
 
+
+#ifdef CDSTEST_GTEST_INSTANTIATE_TEST_CASE_P_HAS_4TH_ARG
+    static std::string get_test_parameter_name( testing::TestParamInfo<size_t> const& p )
+    {
+        return std::to_string( p.param );
+    }
+
     INSTANTIATE_TEST_CASE_P( SQ,
         intrusive_segmented_queue_push_pop,
-        ::testing::ValuesIn( intrusive_segmented_queue_push_pop::get_test_parameters()));
+        ::testing::ValuesIn( intrusive_segmented_queue_push_pop::get_test_parameters() ), get_test_parameter_name );
+#else
+    INSTANTIATE_TEST_CASE_P( SQ,
+        intrusive_segmented_queue_push_pop,
+        ::testing::ValuesIn( intrusive_segmented_queue_push_pop::get_test_parameters() ) );
+#endif
+
 
 } // namespace

diff --git a/test/stress/queue/pop.cpp b/test/stress/queue/pop.cpp
index 3afd236948562a4b0a6294c2661e9d202532dd85..af86b836b27030ea90aa57c1ab98c8d88888152e 100644 (file)
--- a/test/stress/queue/pop.cpp
+++ b/test/stress/queue/pop.cpp
@@ -241,8 +241,19 @@ namespace {
 
     CDSSTRESS_SegmentedQueue( segmented_queue_pop )
 
+#ifdef CDSTEST_GTEST_INSTANTIATE_TEST_CASE_P_HAS_4TH_ARG
+    static std::string get_test_parameter_name( testing::TestParamInfo<size_t> const& p )
+    {
+        return std::to_string( p.param );
+    }
     INSTANTIATE_TEST_CASE_P( SQ,
         segmented_queue_pop,
-        ::testing::ValuesIn( segmented_queue_pop::get_test_parameters()));
+        ::testing::ValuesIn( segmented_queue_pop::get_test_parameters() ), get_test_parameter_name );
+#else
+    INSTANTIATE_TEST_CASE_P( SQ,
+        segmented_queue_pop,
+        ::testing::ValuesIn( segmented_queue_pop::get_test_parameters() ) );
+#endif
+
 
 } // namespace

diff --git a/test/stress/queue/push.cpp b/test/stress/queue/push.cpp
index de3a5ae54e2be8a1230975bebb3eaa63b431eaa4..5840f33b20a391fc40737beadb4a786295f4ec10 100644 (file)
--- a/test/stress/queue/push.cpp
+++ b/test/stress/queue/push.cpp
@@ -244,8 +244,19 @@ namespace {
 
     CDSSTRESS_SegmentedQueue( segmented_queue_push )
 
+#ifdef CDSTEST_GTEST_INSTANTIATE_TEST_CASE_P_HAS_4TH_ARG
+    static std::string get_test_parameter_name( testing::TestParamInfo<size_t> const& p )
+    {
+        return std::to_string( p.param );
+    }
     INSTANTIATE_TEST_CASE_P( SQ,
         segmented_queue_push,
-        ::testing::ValuesIn( segmented_queue_push::get_test_parameters()));
+        ::testing::ValuesIn( segmented_queue_push::get_test_parameters() ), get_test_parameter_name );
+#else
+        INSTANTIATE_TEST_CASE_P( SQ,
+            segmented_queue_push,
+            ::testing::ValuesIn( segmented_queue_push::get_test_parameters() ) );
+#endif
+
 
 } // namespace

diff --git a/test/stress/queue/push_pop.cpp b/test/stress/queue/push_pop.cpp
index b220dc0d97f61bbdb1aab6aa6ff28a5d3c98e51e..060629f566c61e39dd66690c43eaeae24c9d5b92 100644 (file)
--- a/test/stress/queue/push_pop.cpp
+++ b/test/stress/queue/push_pop.cpp
@@ -423,8 +423,18 @@ namespace {
 
     CDSSTRESS_SegmentedQueue( segmented_queue_push_pop )
 
+#ifdef CDSTEST_GTEST_INSTANTIATE_TEST_CASE_P_HAS_4TH_ARG
+    static std::string get_test_parameter_name( testing::TestParamInfo<size_t> const& p )
+    {
+        return std::to_string( p.param );
+    }
+    INSTANTIATE_TEST_CASE_P( SQ,
+        segmented_queue_push_pop,
+        ::testing::ValuesIn( segmented_queue_push_pop::get_test_parameters() ), get_test_parameter_name );
+#else
     INSTANTIATE_TEST_CASE_P( SQ,
         segmented_queue_push_pop,
-        ::testing::ValuesIn( segmented_queue_push_pop::get_test_parameters()));
+        ::testing::ValuesIn( segmented_queue_push_pop::get_test_parameters() ) );
+#endif
 
 } // namespace

diff --git a/test/stress/queue/random.cpp b/test/stress/queue/random.cpp
index f75ca2211dc3921d8cbda34a4253e41233fdad10..a8b0e3b7e5d3855075d0c8822240e99435defe83 100644 (file)
--- a/test/stress/queue/random.cpp
+++ b/test/stress/queue/random.cpp
@@ -323,7 +323,18 @@ namespace {
 
     CDSSTRESS_SegmentedQueue( segmented_queue_random )
 
+#ifdef CDSTEST_GTEST_INSTANTIATE_TEST_CASE_P_HAS_4TH_ARG
+    static std::string get_test_parameter_name( testing::TestParamInfo<size_t> const& p )
+    {
+        return std::to_string( p.param );
+    }
     INSTANTIATE_TEST_CASE_P( SQ,
         segmented_queue_random,
-        ::testing::ValuesIn( segmented_queue_random::get_test_parameters()));
+        ::testing::ValuesIn( segmented_queue_random::get_test_parameters(), get_test_parameter_name ));
+#else
+    INSTANTIATE_TEST_CASE_P( SQ,
+        segmented_queue_random,
+        ::testing::ValuesIn( segmented_queue_random::get_test_parameters() ));
+#endif
+
 } // namespace

diff --git a/test/unit/misc/cxx11_atomic_class.cpp b/test/unit/misc/cxx11_atomic_class.cpp
index 6912ae7f458af5e03097abba1bd450ac23851400..d413176ca781142d1736d92ee575bc35b22339d6 100644 (file)
--- a/test/unit/misc/cxx11_atomic_class.cpp
+++ b/test/unit/misc/cxx11_atomic_class.cpp
@@ -427,6 +427,8 @@ namespace {
         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);
             void *  p;

diff --git a/test/unit/misc/cxx11_atomic_func.cpp b/test/unit/misc/cxx11_atomic_func.cpp
index 17eac5c1d30f2032399b6f90abe1a1ad70c78fe7..13413d77df7d813f709af2d51ed51deda34a7ca1 100644 (file)
--- a/test/unit/misc/cxx11_atomic_func.cpp
+++ b/test/unit/misc/cxx11_atomic_func.cpp
@@ -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;