simple changes

diff --git a/test/include/cds_test/fc_hevy_value.h b/test/include/cds_test/fc_hevy_value.h
index cf4270040a2ae0a3e2eb22a58ada99c192ec6e60..ba3fc2661978278e71910b43b944a95f3a34a5b9 100644 (file)
--- a/test/include/cds_test/fc_hevy_value.h
+++ b/test/include/cds_test/fc_hevy_value.h
@@ -29,7 +29,7 @@ namespace fc_test {
     };
 
     template<int DefaultSize = 10>
-    struct HeavyValue {
+    struct heavy_value {
 
         int value;
 
@@ -39,13 +39,13 @@ namespace fc_test {
         static std::vector<int> pop_buff;
         static size_t buffer_size;
 
-        explicit HeavyValue(int new_value = 0)
+        explicit heavy_value(int new_value = 0)
         : value(new_value),
           nNo(0),
           nWriterNo(0)
         {
         };
-        HeavyValue(const HeavyValue &other)
+        heavy_value(const heavy_value &other)
             : value(other.value),
               nNo(other.nNo),
               nWriterNo(other.nWriterNo)
@@ -63,8 +63,8 @@ namespace fc_test {
         }
     };
     template<int DefaultSize>
-    std::vector<int> HeavyValue< DefaultSize >::pop_buff(DefaultSize, rand());
+    std::vector<int> heavy_value< DefaultSize >::pop_buff(DefaultSize, rand());
     template<int DefaultSize>
-    std::vector<int>::size_type HeavyValue< DefaultSize >::buffer_size = DefaultSize;
+    std::vector<int>::size_type heavy_value< DefaultSize >::buffer_size = DefaultSize;
 }
 #endif /* SOURCE_DIRECTORY__TEST_INCLUDE_CDS_TEST_FC_HEVY_VALUE_H_ */

diff --git a/test/stress/queue/push_pop.cpp b/test/stress/queue/push_pop.cpp
index 2e5058ba0bbdd4bf9c1c1e8c636f37e8e52194ec..cb99297cfcd86aeb81b232761d81ff20c26c606e 100644 (file)
--- a/test/stress/queue/push_pop.cpp
+++ b/test/stress/queue/push_pop.cpp
@@ -342,18 +342,18 @@ namespace {
         //static void TearDownTestCase();
     };
 
-    using value_for_fc_with_heavy_value = queue_push_pop< fc_test::HeavyValue<36000> >;
-    using old_queue_push_pop = queue_push_pop<>;
-
-    CDSSTRESS_MSQueue( old_queue_push_pop )
-    CDSSTRESS_MoirQueue( old_queue_push_pop )
-    CDSSTRESS_BasketQueue( old_queue_push_pop )
-    CDSSTRESS_OptimsticQueue( old_queue_push_pop )
-    CDSSTRESS_FCQueue( old_queue_push_pop )
-    CDSSTRESS_FCDeque( old_queue_push_pop )
-    CDSSTRESS_FCDeque_HeavyValue( value_for_fc_with_heavy_value )
-    CDSSTRESS_RWQueue( old_queue_push_pop )
-    CDSSTRESS_StdQueue( old_queue_push_pop )
+    using fc_with_heavy_value = queue_push_pop< fc_test::heavy_value<36000> >;
+    using simple_queue_push_pop = queue_push_pop<>;
+
+    CDSSTRESS_MSQueue( simple_queue_push_pop )
+    CDSSTRESS_MoirQueue( simple_queue_push_pop )
+    CDSSTRESS_BasketQueue( simple_queue_push_pop )
+    CDSSTRESS_OptimsticQueue( simple_queue_push_pop )
+    CDSSTRESS_FCQueue( simple_queue_push_pop )
+    CDSSTRESS_FCDeque( simple_queue_push_pop )
+    CDSSTRESS_FCDeque_HeavyValue( fc_with_heavy_value )
+    CDSSTRESS_RWQueue( simple_queue_push_pop )
+    CDSSTRESS_StdQueue( simple_queue_push_pop )
 
 #undef CDSSTRESS_Queue_F
 #define CDSSTRESS_Queue_F( test_fixture, type_name, level ) \
@@ -365,7 +365,7 @@ namespace {
         test( queue ); \
     }
 
-    CDSSTRESS_VyukovQueue( old_queue_push_pop )
+    CDSSTRESS_VyukovQueue( simple_queue_push_pop )
 
 #undef CDSSTRESS_Queue_F
 

diff --git a/test/unit/queue/fcqueue.cpp b/test/unit/queue/fcqueue.cpp
index 142bd2690e4e1004bd8c07a630ad3cf5f46239ad..b33160e9827927eb85bca0e1e953ec2e300a4273 100644 (file)
--- a/test/unit/queue/fcqueue.cpp
+++ b/test/unit/queue/fcqueue.cpp
@@ -169,7 +169,7 @@ namespace {
 
        TEST_F( FCQueue, std_deque_heavy_value )
        {
-               typedef fc_test::HeavyValue<> ValueType;
+               typedef fc_test::heavy_value<> ValueType;
                typedef cds::container::FCQueue<ValueType> queue_type;
 
                queue_type q;
@@ -178,7 +178,7 @@ namespace {
 
     TEST_F( FCQueue, std_empty_wait_strategy_heavy_value )
     {
-       typedef fc_test::HeavyValue<> ValueType;
+       typedef fc_test::heavy_value<> ValueType;
         typedef cds::container::FCQueue<ValueType, std::queue< ValueType, std::deque<ValueType>>,
             cds::container::fcqueue::make_traits<
                 cds::opt::wait_strategy< cds::algo::flat_combining::wait_strategy::empty >
@@ -191,7 +191,7 @@ namespace {
 
     TEST_F( FCQueue, std_single_mutex_single_condvar_heavy_value )
     {
-       typedef fc_test::HeavyValue<> ValueType;
+       typedef fc_test::heavy_value<> ValueType;
         typedef cds::container::FCQueue<ValueType, std::queue< ValueType, std::deque<ValueType>>,
             cds::container::fcqueue::make_traits<
                 cds::opt::wait_strategy< cds::algo::flat_combining::wait_strategy::single_mutex_single_condvar<> >
@@ -204,7 +204,7 @@ namespace {
 
     TEST_F( FCQueue, std_single_mutex_multi_condvar_heavy_value )
     {
-       typedef fc_test::HeavyValue<> ValueType;
+       typedef fc_test::heavy_value<> ValueType;
         typedef cds::container::FCQueue<ValueType, std::queue< ValueType, std::deque<ValueType>>,
             cds::container::fcqueue::make_traits<
                 cds::opt::wait_strategy< cds::algo::flat_combining::wait_strategy::single_mutex_multi_condvar<> >
@@ -217,7 +217,7 @@ namespace {
 
     TEST_F( FCQueue, std_multi_mutex_multi_condvar_heavy_value )
     {
-       typedef fc_test::HeavyValue<> ValueType;
+       typedef fc_test::heavy_value<> ValueType;
         typedef cds::container::FCQueue<ValueType, std::queue< ValueType, std::deque<ValueType>>,
             cds::container::fcqueue::make_traits<
                 cds::opt::wait_strategy< cds::algo::flat_combining::wait_strategy::multi_mutex_multi_condvar<> >