From: khizmax Date: Tue, 29 Aug 2017 16:46:37 +0000 (+0300) Subject: formatting X-Git-Tag: v2.3.1 X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=commitdiff_plain;h=9bcb21890d7175dcc634120dac455516fa35dadd;hp=c127b1780d72d0fb14460e939d323875432e5244 formatting --- diff --git a/cds/algo/bit_reversal.h b/cds/algo/bit_reversal.h index b102bfea..b094f8d6 100644 --- a/cds/algo/bit_reversal.h +++ b/cds/algo/bit_reversal.h @@ -54,8 +54,8 @@ namespace cds { namespace algo { /// 64bit uint64_t operator()( uint64_t x ) const { - return ( static_cast( operator()( static_cast( x )) ) << 32 ) // low 32bit - | ( static_cast( operator()( static_cast( x >> 32 )) )); // high 32bit + return ( static_cast( operator()( static_cast( x ))) << 32 ) // low 32bit + | ( static_cast( operator()( static_cast( x >> 32 )))); // high 32bit } }; @@ -93,8 +93,8 @@ namespace cds { namespace algo { /// 64bit uint64_t operator()( uint64_t x ) const { - return ( static_cast( operator()( static_cast( x )) ) << 32 ) | - static_cast( operator()( static_cast( x >> 32 )) ); + return ( static_cast( operator()( static_cast( x ))) << 32 ) | + static_cast( operator()( static_cast( x >> 32 ))); } }; @@ -117,43 +117,43 @@ namespace cds { namespace algo { // for 32bit architecture static uint32_t muldiv32( uint32_t x ) { - return static_cast( muldiv32_byte( static_cast( x >> 24 )) ) - | ( static_cast( muldiv32_byte( static_cast( x >> 16 )) ) << 8 ) - | ( static_cast( muldiv32_byte( static_cast( x >> 8 )) ) << 16 ) - | ( static_cast( muldiv32_byte( static_cast( x )) ) << 24 ); + return static_cast( muldiv32_byte( static_cast( x >> 24 ))) + | ( static_cast( muldiv32_byte( static_cast( x >> 16 ))) << 8 ) + | ( static_cast( muldiv32_byte( static_cast( x >> 8 ))) << 16 ) + | ( static_cast( muldiv32_byte( static_cast( x ))) << 24 ); } static uint64_t muldiv32( uint64_t x ) { - return static_cast( muldiv32_byte( static_cast( x >> 56 )) ) - | ( static_cast( muldiv32_byte( static_cast( x >> 48 )) ) << 8 ) - | ( static_cast( muldiv32_byte( static_cast( x >> 40 )) ) << 16 ) - | ( static_cast( muldiv32_byte( static_cast( x >> 32 )) ) << 24 ) - | ( static_cast( muldiv32_byte( static_cast( x >> 24 )) ) << 32 ) - | ( static_cast( muldiv32_byte( static_cast( x >> 16 )) ) << 40 ) - | ( static_cast( muldiv32_byte( static_cast( x >> 8 )) ) << 48 ) - | ( static_cast( muldiv32_byte( static_cast( x )) ) << 56 ); + return static_cast( muldiv32_byte( static_cast( x >> 56 ))) + | ( static_cast( muldiv32_byte( static_cast( x >> 48 ))) << 8 ) + | ( static_cast( muldiv32_byte( static_cast( x >> 40 ))) << 16 ) + | ( static_cast( muldiv32_byte( static_cast( x >> 32 ))) << 24 ) + | ( static_cast( muldiv32_byte( static_cast( x >> 24 ))) << 32 ) + | ( static_cast( muldiv32_byte( static_cast( x >> 16 ))) << 40 ) + | ( static_cast( muldiv32_byte( static_cast( x >> 8 ))) << 48 ) + | ( static_cast( muldiv32_byte( static_cast( x ))) << 56 ); } /// for 64bit architectire static uint32_t muldiv64( uint32_t x ) { - return static_cast( muldiv64_byte( static_cast( x >> 24 )) ) - | ( static_cast( muldiv64_byte( static_cast( x >> 16 )) ) << 8 ) - | ( static_cast( muldiv64_byte( static_cast( x >> 8 )) ) << 16 ) - | ( static_cast( muldiv64_byte( static_cast( x )) ) << 24 ); + return static_cast( muldiv64_byte( static_cast( x >> 24 ))) + | ( static_cast( muldiv64_byte( static_cast( x >> 16 ))) << 8 ) + | ( static_cast( muldiv64_byte( static_cast( x >> 8 ))) << 16 ) + | ( static_cast( muldiv64_byte( static_cast( x ))) << 24 ); } static uint64_t muldiv64( uint64_t x ) { - return static_cast( muldiv64_byte( static_cast( x >> 56 )) ) - | ( static_cast( muldiv64_byte( static_cast( x >> 48 )) ) << 8 ) - | ( static_cast( muldiv64_byte( static_cast( x >> 40 )) ) << 16 ) - | ( static_cast( muldiv64_byte( static_cast( x >> 32 )) ) << 24 ) - | ( static_cast( muldiv64_byte( static_cast( x >> 24 )) ) << 32 ) - | ( static_cast( muldiv64_byte( static_cast( x >> 16 )) ) << 40 ) - | ( static_cast( muldiv64_byte( static_cast( x >> 8 )) ) << 48 ) - | ( static_cast( muldiv64_byte( static_cast( x )) ) << 56 ); + return static_cast( muldiv64_byte( static_cast( x >> 56 ))) + | ( static_cast( muldiv64_byte( static_cast( x >> 48 ))) << 8 ) + | ( static_cast( muldiv64_byte( static_cast( x >> 40 ))) << 16 ) + | ( static_cast( muldiv64_byte( static_cast( x >> 32 ))) << 24 ) + | ( static_cast( muldiv64_byte( static_cast( x >> 24 ))) << 32 ) + | ( static_cast( muldiv64_byte( static_cast( x >> 16 ))) << 40 ) + | ( static_cast( muldiv64_byte( static_cast( x >> 8 ))) << 48 ) + | ( static_cast( muldiv64_byte( static_cast( x ))) << 56 ); } //@endcond diff --git a/cds/container/impl/bronson_avltree_map_rcu.h b/cds/container/impl/bronson_avltree_map_rcu.h index d1e2d9fa..f21253b5 100644 --- a/cds/container/impl/bronson_avltree_map_rcu.h +++ b/cds/container/impl/bronson_avltree_map_rcu.h @@ -1785,7 +1785,7 @@ namespace cds { namespace container { int hLRL = height_null( child( pLRight, left_child, memory_model::memory_order_relaxed ), memory_model::memory_order_acquire ); int balance = hLL - hLRL; - if ( balance >= -1 && balance <= 1 && !( ( hLL == 0 || hLRL == 0 ) && !pLeft->is_valued( memory_model::memory_order_relaxed )) ) { + if ( balance >= -1 && balance <= 1 && !( ( hLL == 0 || hLRL == 0 ) && !pLeft->is_valued( memory_model::memory_order_relaxed ))) { // nParent.child.left won't be damaged after a double rotation return rotate_right_over_left_locked( pParent, pNode, pLeft, hR, hLL, pLRight, hLRL ); } @@ -1840,7 +1840,7 @@ namespace cds { namespace container { node_type * pRLRight = child( pRLeft, right_child, memory_model::memory_order_relaxed ); int hRLR = height_null( pRLRight, memory_model::memory_order_acquire ); int balance = hRR - hRLR; - if ( balance >= -1 && balance <= 1 && !( ( hRR == 0 || hRLR == 0 ) && !pRight->is_valued( memory_model::memory_order_relaxed )) ) + if ( balance >= -1 && balance <= 1 && !( ( hRR == 0 || hRLR == 0 ) && !pRight->is_valued( memory_model::memory_order_relaxed ))) return rotate_left_over_right_locked( pParent, pNode, hL, pRight, pRLeft, hRR, hRLR ); } diff --git a/cds/gc/dhp.h b/cds/gc/dhp.h index 1b7c6fbe..39cc896f 100644 --- a/cds/gc/dhp.h +++ b/cds/gc/dhp.h @@ -687,7 +687,7 @@ namespace cds { namespace gc { @note Internally, %DHP depends on free-list implementation. There are DCAS-based free-list \p cds::intrusive::TaggedFreeList and more complicated CAS-based free-list - \p cds::intrusive::FreeList. For x86 architecture and GCC/clang, libcds selects appropriate free-list + \p cds::intrusive::FreeList. For x86 architecture and GCC/clang, libcds selects appropriate free-list based on \p -mcx16 compiler flag. You may manually disable DCAS support specifying \p -DCDS_DISABLE_128BIT_ATOMIC for 64bit build or \p -DCDS_DISABLE_64BIT_ATOMIC for 32bit build in compiler command line. All your projects and libcds MUST be compiled with the same flags - @@ -1393,7 +1393,7 @@ namespace cds { namespace gc { static void retire( T * p, void (* func)(void *)) { dhp::thread_data* rec = dhp::smr::tls(); - if ( !rec->retired_.push( dhp::retired_ptr( p, func )) ) + if ( !rec->retired_.push( dhp::retired_ptr( p, func ))) dhp::smr::instance().scan( rec ); } diff --git a/src/dhp.cpp b/src/dhp.cpp index 27014fc8..ef321c7c 100644 --- a/src/dhp.cpp +++ b/src/dhp.cpp @@ -118,7 +118,7 @@ namespace cds { namespace gc { namespace dhp { CDS_EXPORT_API retired_allocator::~retired_allocator() { - while ( retired_block* rb = static_cast( free_list_.get()) ) { + while ( retired_block* rb = static_cast( free_list_.get())) { rb->~retired_block(); s_free_memory( rb ); } diff --git a/test/stress/map/del3/map_del3.cpp b/test/stress/map/del3/map_del3.cpp index 01b0d6ee..66067c35 100644 --- a/test/stress/map/del3/map_del3.cpp +++ b/test/stress/map/del3/map_del3.cpp @@ -125,6 +125,6 @@ namespace map { } INSTANTIATE_TEST_CASE_P( a, Map_Del3_LF, ::testing::ValuesIn( Map_Del3_LF::get_load_factors()), get_test_parameter_name ); #else - INSTANTIATE_TEST_CASE_P( a, Map_Del3_LF, ::testing::ValuesIn( Map_Del3_LF::get_load_factors()) ); + INSTANTIATE_TEST_CASE_P( a, Map_Del3_LF, ::testing::ValuesIn( Map_Del3_LF::get_load_factors())); #endif } // namespace map diff --git a/test/stress/map/delodd/map_delodd.cpp b/test/stress/map/delodd/map_delodd.cpp index 236bb97b..410327fe 100644 --- a/test/stress/map/delodd/map_delodd.cpp +++ b/test/stress/map/delodd/map_delodd.cpp @@ -125,7 +125,7 @@ namespace map { } INSTANTIATE_TEST_CASE_P( a, Map_DelOdd_LF, ::testing::ValuesIn( Map_DelOdd_LF::get_load_factors()), get_test_parameter_name ); #else - INSTANTIATE_TEST_CASE_P( a, Map_DelOdd_LF, ::testing::ValuesIn( Map_DelOdd_LF::get_load_factors()) ); + INSTANTIATE_TEST_CASE_P( a, Map_DelOdd_LF, ::testing::ValuesIn( Map_DelOdd_LF::get_load_factors())); #endif } // namespace map diff --git a/test/stress/map/find_string/map_find_string.cpp b/test/stress/map/find_string/map_find_string.cpp index b2318860..7da0e8dd 100644 --- a/test/stress/map/find_string/map_find_string.cpp +++ b/test/stress/map/find_string/map_find_string.cpp @@ -202,7 +202,7 @@ namespace map { } INSTANTIATE_TEST_CASE_P( a, Map_find_string_LF, ::testing::ValuesIn( Map_find_string::get_load_factors()), get_test_parameter_name ); #else - INSTANTIATE_TEST_CASE_P( a, Map_find_string_LF, ::testing::ValuesIn( Map_find_string::get_load_factors()) ); + INSTANTIATE_TEST_CASE_P( a, Map_find_string_LF, ::testing::ValuesIn( Map_find_string::get_load_factors())); #endif diff --git a/test/stress/map/insdel_func/map_insdel_func.cpp b/test/stress/map/insdel_func/map_insdel_func.cpp index 4bef9eab..a5245f3d 100644 --- a/test/stress/map/insdel_func/map_insdel_func.cpp +++ b/test/stress/map/insdel_func/map_insdel_func.cpp @@ -129,7 +129,7 @@ namespace map { } INSTANTIATE_TEST_CASE_P( a, Map_InsDel_func_LF, ::testing::ValuesIn( Map_InsDel_func_LF::get_load_factors()), get_test_parameter_name ); #else - INSTANTIATE_TEST_CASE_P( a, Map_InsDel_func_LF, ::testing::ValuesIn( Map_InsDel_func_LF::get_load_factors()) ); + INSTANTIATE_TEST_CASE_P( a, Map_InsDel_func_LF, ::testing::ValuesIn( Map_InsDel_func_LF::get_load_factors())); #endif } // namespace map diff --git a/test/stress/map/insdel_item_int/map_insdel_item_int.cpp b/test/stress/map/insdel_item_int/map_insdel_item_int.cpp index 2b333b2a..9dc75aa5 100644 --- a/test/stress/map/insdel_item_int/map_insdel_item_int.cpp +++ b/test/stress/map/insdel_item_int/map_insdel_item_int.cpp @@ -114,7 +114,7 @@ namespace map { } INSTANTIATE_TEST_CASE_P( a, Map_InsDel_item_int_LF, ::testing::ValuesIn( Map_InsDel_item_int_LF::get_load_factors()), get_test_parameter_name ); #else - INSTANTIATE_TEST_CASE_P( a, Map_InsDel_item_int_LF, ::testing::ValuesIn( Map_InsDel_item_int_LF::get_load_factors()) ); + INSTANTIATE_TEST_CASE_P( a, Map_InsDel_item_int_LF, ::testing::ValuesIn( Map_InsDel_item_int_LF::get_load_factors())); #endif } // namespace map diff --git a/test/stress/map/insdel_string/map_insdel_string.cpp b/test/stress/map/insdel_string/map_insdel_string.cpp index e6a282b9..e1a422ef 100644 --- a/test/stress/map/insdel_string/map_insdel_string.cpp +++ b/test/stress/map/insdel_string/map_insdel_string.cpp @@ -185,7 +185,7 @@ namespace map { } INSTANTIATE_TEST_CASE_P( a, Map_InsDel_string_LF, ::testing::ValuesIn( Map_InsDel_string::get_load_factors()), get_test_parameter_name ); #else - INSTANTIATE_TEST_CASE_P( a, Map_InsDel_string_LF, ::testing::ValuesIn( Map_InsDel_string::get_load_factors()) ); + INSTANTIATE_TEST_CASE_P( a, Map_InsDel_string_LF, ::testing::ValuesIn( Map_InsDel_string::get_load_factors())); #endif } // namespace map diff --git a/test/stress/map/insdelfind/map_insdelfind.cpp b/test/stress/map/insdelfind/map_insdelfind.cpp index d2fe73ff..ea0c9704 100644 --- a/test/stress/map/insdelfind/map_insdelfind.cpp +++ b/test/stress/map/insdelfind/map_insdelfind.cpp @@ -137,7 +137,7 @@ namespace map { } INSTANTIATE_TEST_CASE_P( a, Map_InsDelFind_LF, ::testing::ValuesIn( Map_InsDelFind_LF::get_load_factors()), get_test_parameter_name ); #else - INSTANTIATE_TEST_CASE_P( a, Map_InsDelFind_LF, ::testing::ValuesIn( Map_InsDelFind_LF::get_load_factors()) ); + INSTANTIATE_TEST_CASE_P( a, Map_InsDelFind_LF, ::testing::ValuesIn( Map_InsDelFind_LF::get_load_factors())); #endif } // namespace map diff --git a/test/stress/map/iter_erase/map_iter_erase.cpp b/test/stress/map/iter_erase/map_iter_erase.cpp index ffb6cd54..ac04e53d 100644 --- a/test/stress/map/iter_erase/map_iter_erase.cpp +++ b/test/stress/map/iter_erase/map_iter_erase.cpp @@ -111,7 +111,7 @@ namespace map { } INSTANTIATE_TEST_CASE_P( a, Map_Iter_Del3_LF, ::testing::ValuesIn( Map_Iter_Del3_LF::get_load_factors()), get_test_parameter_name ); #else - INSTANTIATE_TEST_CASE_P( a, Map_Iter_Del3_LF, ::testing::ValuesIn( Map_Iter_Del3_LF::get_load_factors()) ); + INSTANTIATE_TEST_CASE_P( a, Map_Iter_Del3_LF, ::testing::ValuesIn( Map_Iter_Del3_LF::get_load_factors())); #endif } // namespace map diff --git a/test/stress/queue/intrusive_push_pop.cpp b/test/stress/queue/intrusive_push_pop.cpp index 777736bf..2db3c539 100644 --- a/test/stress/queue/intrusive_push_pop.cpp +++ b/test/stress/queue/intrusive_push_pop.cpp @@ -522,7 +522,7 @@ namespace { #else 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())); #endif diff --git a/test/stress/queue/pop.cpp b/test/stress/queue/pop.cpp index 499309a4..21c06105 100644 --- a/test/stress/queue/pop.cpp +++ b/test/stress/queue/pop.cpp @@ -252,7 +252,7 @@ namespace { #else INSTANTIATE_TEST_CASE_P( SQ, segmented_queue_pop, - ::testing::ValuesIn( segmented_queue_pop::get_test_parameters()) ); + ::testing::ValuesIn( segmented_queue_pop::get_test_parameters())); #endif diff --git a/test/stress/queue/push.cpp b/test/stress/queue/push.cpp index fb286143..65e4aee6 100644 --- a/test/stress/queue/push.cpp +++ b/test/stress/queue/push.cpp @@ -255,7 +255,7 @@ namespace { #else INSTANTIATE_TEST_CASE_P( SQ, segmented_queue_push, - ::testing::ValuesIn( segmented_queue_push::get_test_parameters()) ); + ::testing::ValuesIn( segmented_queue_push::get_test_parameters())); #endif diff --git a/test/stress/queue/push_pop.cpp b/test/stress/queue/push_pop.cpp index 14b02765..47a4097d 100644 --- a/test/stress/queue/push_pop.cpp +++ b/test/stress/queue/push_pop.cpp @@ -434,7 +434,7 @@ namespace { #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/set/del3/set_del3.cpp b/test/stress/set/del3/set_del3.cpp index 283f441c..260ff461 100644 --- a/test/stress/set/del3/set_del3.cpp +++ b/test/stress/set/del3/set_del3.cpp @@ -127,7 +127,7 @@ namespace set { } INSTANTIATE_TEST_CASE_P( a, Set_Del3_LF, ::testing::ValuesIn( Set_Del3_LF::get_load_factors()), get_test_parameter_name ); #else - INSTANTIATE_TEST_CASE_P( a, Set_Del3_LF, ::testing::ValuesIn( Set_Del3_LF::get_load_factors()) ); + INSTANTIATE_TEST_CASE_P( a, Set_Del3_LF, ::testing::ValuesIn( Set_Del3_LF::get_load_factors())); #endif } // namespace set diff --git a/test/stress/set/delodd/set_delodd.cpp b/test/stress/set/delodd/set_delodd.cpp index 0835a472..f454f127 100644 --- a/test/stress/set/delodd/set_delodd.cpp +++ b/test/stress/set/delodd/set_delodd.cpp @@ -126,6 +126,6 @@ namespace set { } INSTANTIATE_TEST_CASE_P( a, Set_DelOdd_LF, ::testing::ValuesIn( Set_DelOdd_LF::get_load_factors()), get_test_parameter_name ); #else - INSTANTIATE_TEST_CASE_P( a, Set_DelOdd_LF, ::testing::ValuesIn( Set_DelOdd_LF::get_load_factors()) ); + INSTANTIATE_TEST_CASE_P( a, Set_DelOdd_LF, ::testing::ValuesIn( Set_DelOdd_LF::get_load_factors())); #endif } // namespace set diff --git a/test/stress/set/insdel_find/set_insdelfind.cpp b/test/stress/set/insdel_find/set_insdelfind.cpp index f0b5a7b5..afcff02c 100644 --- a/test/stress/set/insdel_find/set_insdelfind.cpp +++ b/test/stress/set/insdel_find/set_insdelfind.cpp @@ -130,7 +130,7 @@ namespace set { } INSTANTIATE_TEST_CASE_P( a, Set_InsDelFind_LF, ::testing::ValuesIn( Set_InsDelFind_LF::get_load_factors()), get_test_parameter_name ); #else - INSTANTIATE_TEST_CASE_P( a, Set_InsDelFind_LF, ::testing::ValuesIn( Set_InsDelFind_LF::get_load_factors()) ); + INSTANTIATE_TEST_CASE_P( a, Set_InsDelFind_LF, ::testing::ValuesIn( Set_InsDelFind_LF::get_load_factors())); #endif } // namespace set diff --git a/test/stress/set/insdel_func/set_insdel_func.cpp b/test/stress/set/insdel_func/set_insdel_func.cpp index 9c120459..9ce8d9a5 100644 --- a/test/stress/set/insdel_func/set_insdel_func.cpp +++ b/test/stress/set/insdel_func/set_insdel_func.cpp @@ -117,6 +117,6 @@ namespace set { } INSTANTIATE_TEST_CASE_P( a, Set_InsDel_func_LF, ::testing::ValuesIn( Set_InsDel_func_LF::get_load_factors()), get_test_parameter_name ); #else - INSTANTIATE_TEST_CASE_P( a, Set_InsDel_func_LF, ::testing::ValuesIn( Set_InsDel_func_LF::get_load_factors()) ); + INSTANTIATE_TEST_CASE_P( a, Set_InsDel_func_LF, ::testing::ValuesIn( Set_InsDel_func_LF::get_load_factors())); #endif } // namespace set diff --git a/test/stress/set/insdel_string/set_insdel_string.cpp b/test/stress/set/insdel_string/set_insdel_string.cpp index dee00c9f..40f066e4 100644 --- a/test/stress/set/insdel_string/set_insdel_string.cpp +++ b/test/stress/set/insdel_string/set_insdel_string.cpp @@ -121,7 +121,7 @@ namespace set { } INSTANTIATE_TEST_CASE_P( a, Set_InsDel_string_LF, ::testing::ValuesIn( Set_InsDel_string_LF::get_load_factors()), get_test_parameter_name ); #else - INSTANTIATE_TEST_CASE_P( a, Set_InsDel_string_LF, ::testing::ValuesIn( Set_InsDel_string_LF::get_load_factors()) ); + INSTANTIATE_TEST_CASE_P( a, Set_InsDel_string_LF, ::testing::ValuesIn( Set_InsDel_string_LF::get_load_factors())); #endif diff --git a/test/stress/set/iter_erase/set_iter_erase.cpp b/test/stress/set/iter_erase/set_iter_erase.cpp index d5319675..e52a4c89 100644 --- a/test/stress/set/iter_erase/set_iter_erase.cpp +++ b/test/stress/set/iter_erase/set_iter_erase.cpp @@ -111,6 +111,6 @@ namespace set { } INSTANTIATE_TEST_CASE_P( a, Set_Iter_Del3_LF, ::testing::ValuesIn( Set_Iter_Del3_LF::get_load_factors()), get_test_parameter_name ); #else - INSTANTIATE_TEST_CASE_P( a, Set_Iter_Del3_LF, ::testing::ValuesIn( Set_Iter_Del3_LF::get_load_factors()) ); + INSTANTIATE_TEST_CASE_P( a, Set_Iter_Del3_LF, ::testing::ValuesIn( Set_Iter_Del3_LF::get_load_factors())); #endif } // namespace set diff --git a/test/stress/set/iteration/set_iteration.cpp b/test/stress/set/iteration/set_iteration.cpp index 5c8fc46b..8012b263 100644 --- a/test/stress/set/iteration/set_iteration.cpp +++ b/test/stress/set/iteration/set_iteration.cpp @@ -121,6 +121,6 @@ namespace set { } INSTANTIATE_TEST_CASE_P( a, Set_Iteration_LF, ::testing::ValuesIn( Set_Iteration_LF::get_load_factors()), get_test_parameter_name ); #else - INSTANTIATE_TEST_CASE_P( a, Set_Iteration_LF, ::testing::ValuesIn( Set_Iteration_LF::get_load_factors()) ); + INSTANTIATE_TEST_CASE_P( a, Set_Iteration_LF, ::testing::ValuesIn( Set_Iteration_LF::get_load_factors())); #endif } // namespace set diff --git a/test/unit/queue/vyukov_mpmc_queue.cpp b/test/unit/queue/vyukov_mpmc_queue.cpp index 2023d245..9b83e4a7 100644 --- a/test/unit/queue/vyukov_mpmc_queue.cpp +++ b/test/unit/queue/vyukov_mpmc_queue.cpp @@ -51,7 +51,7 @@ namespace { // enqueue/dequeue for ( unsigned pass = 0; pass < 3; ++pass ) { for ( size_t i = 0; i < nSize; ++i ) { - ASSERT_TRUE( q.enqueue( static_cast( i )) ); + ASSERT_TRUE( q.enqueue( static_cast( i ))); ASSERT_CONTAINER_SIZE( q, i + 1 ); } ASSERT_FALSE( q.empty()); diff --git a/test/unit/queue/weak_ringbuffer.cpp b/test/unit/queue/weak_ringbuffer.cpp index c6eee650..6835d38f 100644 --- a/test/unit/queue/weak_ringbuffer.cpp +++ b/test/unit/queue/weak_ringbuffer.cpp @@ -70,7 +70,7 @@ namespace { ASSERT_FALSE( q.full()); ASSERT_CONTAINER_SIZE( q, nArrCount * nArrSize ); for ( size_t i = nArrCount * nArrSize; i < nSize; ++i ) { - ASSERT_TRUE( q.enqueue( static_cast( i )) ); + ASSERT_TRUE( q.enqueue( static_cast( i ))); } } ASSERT_TRUE( q.full());