From 3beeba8aac668c6f8d2492286b2303f2c76e870b Mon Sep 17 00:00:00 2001 From: khizmax Date: Wed, 26 Apr 2017 16:46:53 +0300 Subject: [PATCH] Fixed minor warnings --- test/stress/queue/intrusive_push_pop.cpp | 15 ++++++++++++++- test/stress/queue/pop.cpp | 13 ++++++++++++- test/stress/queue/push.cpp | 13 ++++++++++++- test/stress/queue/push_pop.cpp | 12 +++++++++++- test/stress/queue/random.cpp | 13 ++++++++++++- test/unit/misc/cxx11_atomic_class.cpp | 2 ++ test/unit/misc/cxx11_atomic_func.cpp | 2 ++ 7 files changed, 65 insertions(+), 5 deletions(-) diff --git a/test/stress/queue/intrusive_push_pop.cpp b/test/stress/queue/intrusive_push_pop.cpp index eede7abd..b30e398c 100644 --- 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 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 3afd2369..af86b836 100644 --- 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 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 de3a5ae5..5840f33b 100644 --- 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 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 b220dc0d..060629f5 100644 --- 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 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 f75ca221..a8b0e3b7 100644 --- 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 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 6912ae7f..d413176c 100644 --- a/test/unit/misc/cxx11_atomic_class.cpp +++ b/test/unit/misc/cxx11_atomic_class.cpp @@ -427,6 +427,8 @@ namespace { template 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 17eac5c1..13413d77 100644 --- a/test/unit/misc/cxx11_atomic_func.cpp +++ b/test/unit/misc/cxx11_atomic_func.cpp @@ -488,6 +488,8 @@ namespace misc { template 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; -- 2.34.1