formatting v2.3.1
authorkhizmax <khizmax@gmail.com>
Tue, 29 Aug 2017 16:46:37 +0000 (19:46 +0300)
committerkhizmax <khizmax@gmail.com>
Tue, 29 Aug 2017 16:46:37 +0000 (19:46 +0300)
25 files changed:
cds/algo/bit_reversal.h
cds/container/impl/bronson_avltree_map_rcu.h
cds/gc/dhp.h
src/dhp.cpp
test/stress/map/del3/map_del3.cpp
test/stress/map/delodd/map_delodd.cpp
test/stress/map/find_string/map_find_string.cpp
test/stress/map/insdel_func/map_insdel_func.cpp
test/stress/map/insdel_item_int/map_insdel_item_int.cpp
test/stress/map/insdel_string/map_insdel_string.cpp
test/stress/map/insdelfind/map_insdelfind.cpp
test/stress/map/iter_erase/map_iter_erase.cpp
test/stress/queue/intrusive_push_pop.cpp
test/stress/queue/pop.cpp
test/stress/queue/push.cpp
test/stress/queue/push_pop.cpp
test/stress/set/del3/set_del3.cpp
test/stress/set/delodd/set_delodd.cpp
test/stress/set/insdel_find/set_insdelfind.cpp
test/stress/set/insdel_func/set_insdel_func.cpp
test/stress/set/insdel_string/set_insdel_string.cpp
test/stress/set/iter_erase/set_iter_erase.cpp
test/stress/set/iteration/set_iteration.cpp
test/unit/queue/vyukov_mpmc_queue.cpp
test/unit/queue/weak_ringbuffer.cpp

index b102bfea8a3d130f66cd5a7a99ce0aca0dd0a629..b094f8d63fdf2b323a8130a2ac9ac4c59b74c58d 100644 (file)
@@ -54,8 +54,8 @@ namespace cds { namespace algo {
             /// 64bit
             uint64_t operator()( uint64_t x ) const
             {
-                return ( static_cast<uint64_t>( operator()( static_cast<uint32_t>( x )) ) << 32 )  // low 32bit
-                    | ( static_cast<uint64_t>( operator()( static_cast<uint32_t>( x >> 32 )) ));  // high 32bit
+                return ( static_cast<uint64_t>( operator()( static_cast<uint32_t>( x ))) << 32 )  // low 32bit
+                    | ( static_cast<uint64_t>( operator()( static_cast<uint32_t>( x >> 32 ))));  // high 32bit
             }
         };
 
@@ -93,8 +93,8 @@ namespace cds { namespace algo {
             /// 64bit
             uint64_t operator()( uint64_t x ) const
             {
-                return ( static_cast<uint64_t>( operator()( static_cast<uint32_t>( x )) ) << 32 ) |
-                    static_cast<uint64_t>( operator()( static_cast<uint32_t>( x >> 32 )) );
+                return ( static_cast<uint64_t>( operator()( static_cast<uint32_t>( x ))) << 32 ) |
+                    static_cast<uint64_t>( operator()( static_cast<uint32_t>( x >> 32 )));
             }
         };
 
@@ -117,43 +117,43 @@ namespace cds { namespace algo {
             // for 32bit architecture
             static uint32_t muldiv32( uint32_t x )
             {
-                return static_cast<uint32_t>( muldiv32_byte( static_cast<uint8_t>( x >> 24 )) )
-                    | ( static_cast<uint32_t>( muldiv32_byte( static_cast<uint8_t>( x >> 16 )) ) << 8 )
-                    | ( static_cast<uint32_t>( muldiv32_byte( static_cast<uint8_t>( x >> 8 )) ) << 16 )
-                    | ( static_cast<uint32_t>( muldiv32_byte( static_cast<uint8_t>( x )) ) << 24 );
+                return static_cast<uint32_t>( muldiv32_byte( static_cast<uint8_t>( x >> 24 )))
+                    | ( static_cast<uint32_t>( muldiv32_byte( static_cast<uint8_t>( x >> 16 ))) << 8 )
+                    | ( static_cast<uint32_t>( muldiv32_byte( static_cast<uint8_t>( x >> 8 ))) << 16 )
+                    | ( static_cast<uint32_t>( muldiv32_byte( static_cast<uint8_t>( x ))) << 24 );
             }
 
             static uint64_t muldiv32( uint64_t x )
             {
-                return static_cast<uint64_t>( muldiv32_byte( static_cast<uint8_t>( x >> 56 )) )
-                    | ( static_cast<uint64_t>( muldiv32_byte( static_cast<uint8_t>( x >> 48 )) ) << 8 )
-                    | ( static_cast<uint64_t>( muldiv32_byte( static_cast<uint8_t>( x >> 40 )) ) << 16 )
-                    | ( static_cast<uint64_t>( muldiv32_byte( static_cast<uint8_t>( x >> 32 )) ) << 24 )
-                    | ( static_cast<uint64_t>( muldiv32_byte( static_cast<uint8_t>( x >> 24 )) ) << 32 )
-                    | ( static_cast<uint64_t>( muldiv32_byte( static_cast<uint8_t>( x >> 16 )) ) << 40 )
-                    | ( static_cast<uint64_t>( muldiv32_byte( static_cast<uint8_t>( x >> 8 )) ) << 48 )
-                    | ( static_cast<uint64_t>( muldiv32_byte( static_cast<uint8_t>( x )) ) << 56 );
+                return static_cast<uint64_t>( muldiv32_byte( static_cast<uint8_t>( x >> 56 )))
+                    | ( static_cast<uint64_t>( muldiv32_byte( static_cast<uint8_t>( x >> 48 ))) << 8 )
+                    | ( static_cast<uint64_t>( muldiv32_byte( static_cast<uint8_t>( x >> 40 ))) << 16 )
+                    | ( static_cast<uint64_t>( muldiv32_byte( static_cast<uint8_t>( x >> 32 ))) << 24 )
+                    | ( static_cast<uint64_t>( muldiv32_byte( static_cast<uint8_t>( x >> 24 ))) << 32 )
+                    | ( static_cast<uint64_t>( muldiv32_byte( static_cast<uint8_t>( x >> 16 ))) << 40 )
+                    | ( static_cast<uint64_t>( muldiv32_byte( static_cast<uint8_t>( x >> 8 ))) << 48 )
+                    | ( static_cast<uint64_t>( muldiv32_byte( static_cast<uint8_t>( x ))) << 56 );
             }
 
             /// for 64bit architectire
             static uint32_t muldiv64( uint32_t x )
             {
-                return static_cast<uint32_t>( muldiv64_byte( static_cast<uint8_t>( x >> 24 )) )
-                    | ( static_cast<uint32_t>( muldiv64_byte( static_cast<uint8_t>( x >> 16 )) ) << 8 )
-                    | ( static_cast<uint32_t>( muldiv64_byte( static_cast<uint8_t>( x >> 8 )) ) << 16 )
-                    | ( static_cast<uint32_t>( muldiv64_byte( static_cast<uint8_t>( x )) ) << 24 );
+                return static_cast<uint32_t>( muldiv64_byte( static_cast<uint8_t>( x >> 24 )))
+                    | ( static_cast<uint32_t>( muldiv64_byte( static_cast<uint8_t>( x >> 16 ))) << 8 )
+                    | ( static_cast<uint32_t>( muldiv64_byte( static_cast<uint8_t>( x >> 8 ))) << 16 )
+                    | ( static_cast<uint32_t>( muldiv64_byte( static_cast<uint8_t>( x ))) << 24 );
             }
 
             static uint64_t muldiv64( uint64_t x )
             {
-                return static_cast<uint64_t>( muldiv64_byte( static_cast<uint8_t>( x >> 56 )) )
-                    | ( static_cast<uint64_t>( muldiv64_byte( static_cast<uint8_t>( x >> 48 )) ) << 8 )
-                    | ( static_cast<uint64_t>( muldiv64_byte( static_cast<uint8_t>( x >> 40 )) ) << 16 )
-                    | ( static_cast<uint64_t>( muldiv64_byte( static_cast<uint8_t>( x >> 32 )) ) << 24 )
-                    | ( static_cast<uint64_t>( muldiv64_byte( static_cast<uint8_t>( x >> 24 )) ) << 32 )
-                    | ( static_cast<uint64_t>( muldiv64_byte( static_cast<uint8_t>( x >> 16 )) ) << 40 )
-                    | ( static_cast<uint64_t>( muldiv64_byte( static_cast<uint8_t>( x >> 8 )) ) << 48 )
-                    | ( static_cast<uint64_t>( muldiv64_byte( static_cast<uint8_t>( x )) ) << 56 );
+                return static_cast<uint64_t>( muldiv64_byte( static_cast<uint8_t>( x >> 56 )))
+                    | ( static_cast<uint64_t>( muldiv64_byte( static_cast<uint8_t>( x >> 48 ))) << 8 )
+                    | ( static_cast<uint64_t>( muldiv64_byte( static_cast<uint8_t>( x >> 40 ))) << 16 )
+                    | ( static_cast<uint64_t>( muldiv64_byte( static_cast<uint8_t>( x >> 32 ))) << 24 )
+                    | ( static_cast<uint64_t>( muldiv64_byte( static_cast<uint8_t>( x >> 24 ))) << 32 )
+                    | ( static_cast<uint64_t>( muldiv64_byte( static_cast<uint8_t>( x >> 16 ))) << 40 )
+                    | ( static_cast<uint64_t>( muldiv64_byte( static_cast<uint8_t>( x >> 8 ))) << 48 )
+                    | ( static_cast<uint64_t>( muldiv64_byte( static_cast<uint8_t>( x ))) << 56 );
             }
             //@endcond
 
index d1e2d9fab20326ed014bff7fcd2f7f9126c63167..f21253b5728529262d7bf252b7290dc1d3a53f49 100644 (file)
@@ -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 );
                 }
 
index 1b7c6fbe05b0db606bbe685abcfd9b52a8c593bd..39cc896f6b3e8e6ee58d94f6f8ba5f2712e1de8a 100644 (file)
@@ -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 );
         }
 
index 27014fc84b2946d31a6eb511a09937f36d240c9f..ef321c7cdbfa36502c6650aeb7d3abc17bc5d811 100644 (file)
@@ -118,7 +118,7 @@ namespace cds { namespace gc { namespace dhp {
 
     CDS_EXPORT_API retired_allocator::~retired_allocator()
     {
-        while ( retired_block* rb = static_cast<retired_block*>( free_list_.get()) ) {
+        while ( retired_block* rb = static_cast<retired_block*>( free_list_.get())) {
             rb->~retired_block();
             s_free_memory( rb );
         }
index 01b0d6ee9dcccc6a272c4b4fae7acb5c34108bc1..66067c359a9a5edf21e3270dc2bc6b772ec1d723 100644 (file)
@@ -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
index 236bb97b046c20a80704de6f5c6b6b8b631b0737..410327feeea2fd8dac550bccf45391733afd1dd1 100644 (file)
@@ -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
index b23188605f60042ec840f22580eb7f44a1ad6d20..7da0e8dd335a1a65dc12738f93aa583d6839993b 100644 (file)
@@ -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
 
 
index 4bef9eabb8a6352ae366d541292ab656ce5d800b..a5245f3da5a2dfd31d0515b4a191c24d6153e255 100644 (file)
@@ -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
index 2b333b2a8637de448ad63ea9915f807c696fadcf..9dc75aa5bd84db7754da2916dd0ab09339a4e5f8 100644 (file)
@@ -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
index e6a282b9b191b5f98312a397561125b4ef776d60..e1a422efebc248ed35b35d72133fa2386e0fc8e2 100644 (file)
@@ -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
index d2fe73ff963fa053b44a53ce5c93c6ccb8f4e13b..ea0c970445da33f666c7196fa2ee1378706dafe1 100644 (file)
@@ -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
index ffb6cd546e0a3a2261d3e1e02a1a19459451e340..ac04e53dae94931233f13ec59f894e84c360de40 100644 (file)
@@ -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
index 777736bf82417aad873cab8f47479faaa30f2493..2db3c5396d750903635b1750ab1eda2f3f320d17 100644 (file)
@@ -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
 
 
index 499309a41079ae7117a1e258d522885f3749529d..21c0610511a57923ac90b369a0f3e686a70310f5 100644 (file)
@@ -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
 
 
index fb286143160ce6f37305dc90cfc1dab1da16becf..65e4aee6bbfe9f262ed0ffd07e97b4f22080b9e2 100644 (file)
@@ -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
 
 
index 14b027652054931e3b7a0aadb45964f045103b7b..47a4097dc689a4007bd660f21335e7e237589d13 100644 (file)
@@ -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
index 283f441c09eebc19cd036109d6cec08280e5c8db..260ff4619328d9faef315041e86f298183fe5d96 100644 (file)
@@ -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
index 0835a4729488cbb75894728d9e7972156fd77eb4..f454f1270e6aa065014cf62a3e1f99ca3f022572 100644 (file)
@@ -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
index f0b5a7b57a1e580324adb2f6bbc361c3e79ab802..afcff02ce501325cd3cc599ba8e46e4336c219a8 100644 (file)
@@ -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
index 9c120459dede89546bc2d78d721a58046cbd01f9..9ce8d9a50ce8adb670b0fbbd1d3bf8c164e133cb 100644 (file)
@@ -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
index dee00c9f2c86871c321580c4990b5c0133a7e45c..40f066e4e746bf5ac43c4ee427fed369fc44906f 100644 (file)
@@ -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
 
 
index d53196750e6bb24bd7efce80c76ee71278b1528c..e52a4c8992c809a6d569c280cd2185258c42f018 100644 (file)
@@ -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
index 5c8fc46b3bf77432f8e205b04ebb4df8f8fe9552..8012b263f64ef047cc9122130925d8c082f9096c 100644 (file)
@@ -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
index 2023d245c982b0969d8e95fcb187dbe196f2b818..9b83e4a7b0ca9f8f36062728850ba1418a8f3927 100644 (file)
@@ -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<value_type>( i )) );
+                    ASSERT_TRUE( q.enqueue( static_cast<value_type>( i )));
                     ASSERT_CONTAINER_SIZE( q, i + 1 );
                 }
                 ASSERT_FALSE( q.empty());
index c6eee650b67fc1558bca4bc5910162fe2d3adacf..6835d38f1368cb5363f16c62df13c72305c9ca73 100644 (file)
@@ -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<value_type>( i )) );
+                            ASSERT_TRUE( q.enqueue( static_cast<value_type>( i )));
                         }
                     }
                     ASSERT_TRUE( q.full());