Bugfix for MichaelDeque commits

diff --git a/tests/unit/queue/intrusive_queue_reader_writer.cpp b/tests/unit/queue/intrusive_queue_reader_writer.cpp
index 1c36934e061006a81a117e3a0391f1bc1a2abd6f..5010c5e454c05d30981db83a3dafb8c4d8d77b86 100644 (file)
--- a/tests/unit/queue/intrusive_queue_reader_writer.cpp
+++ b/tests/unit/queue/intrusive_queue_reader_writer.cpp
@@ -435,7 +435,6 @@ namespace queue {
         CDSUNIT_DECLARE_MoirQueue
         CDSUNIT_DECLARE_OptimisticQueue
         CDSUNIT_DECLARE_BasketQueue
-        CDSUNIT_DECLARE_MichaelDeque
         CDSUNIT_DECLARE_FCQueue
         CDSUNIT_DECLARE_SegmentedQueue
         CDSUNIT_DECLARE_TsigasCycleQueue
@@ -448,7 +447,6 @@ namespace queue {
             CDSUNIT_TEST_MoirQueue
             CDSUNIT_TEST_OptimisticQueue
             CDSUNIT_TEST_BasketQueue
-            CDSUNIT_TEST_MichaelDeque
             CDSUNIT_TEST_FCQueue
             CDSUNIT_TEST_SegmentedQueue
             CDSUNIT_TEST_TsigasCycleQueue

diff --git a/tests/unit/queue/queue_pop.cpp b/tests/unit/queue/queue_pop.cpp
index 43843ac9ec82b8811e6ad79148ecf4caa4ababab..76dc5b8b52ed5976e00d698cd49ab65c872b14e0 100644 (file)
--- a/tests/unit/queue/queue_pop.cpp
+++ b/tests/unit/queue/queue_pop.cpp
@@ -203,7 +203,6 @@ namespace queue {
         CDSUNIT_DECLARE_FCDeque( SimpleValue )
         CDSUNIT_DECLARE_SegmentedQueue( SimpleValue )
         CDSUNIT_DECLARE_RWQueue( SimpleValue )
-        CDSUNIT_DECLARE_MichaelDeque( SimpleValue )
         CDSUNIT_DECLARE_TsigasCysleQueue( SimpleValue )
         CDSUNIT_DECLARE_VyukovMPMCCycleQueue( SimpleValue )
         CDSUNIT_DECLARE_StdQueue( SimpleValue )
@@ -217,7 +216,6 @@ namespace queue {
             CDSUNIT_TEST_FCDeque
             CDSUNIT_TEST_SegmentedQueue
             CDSUNIT_TEST_RWQueue
-            CDSUNIT_TEST_MichaelDeque
             CDSUNIT_TEST_TsigasCysleQueue
             CDSUNIT_TEST_VyukovMPMCCycleQueue
             CDSUNIT_TEST_StdQueue

diff --git a/tests/unit/queue/queue_push.cpp b/tests/unit/queue/queue_push.cpp
index 792297860aee7bc2fbc41790b0fa07474dfe2a9a..e5e834be0c257279df66ae02cce8857b633c1342 100644 (file)
--- a/tests/unit/queue/queue_push.cpp
+++ b/tests/unit/queue/queue_push.cpp
@@ -214,7 +214,6 @@ namespace queue {
         CDSUNIT_DECLARE_FCDeque( SimpleValue )
         CDSUNIT_DECLARE_SegmentedQueue( SimpleValue )
         CDSUNIT_DECLARE_RWQueue( SimpleValue )
-        CDSUNIT_DECLARE_MichaelDeque( SimpleValue )
         CDSUNIT_DECLARE_TsigasCysleQueue( SimpleValue )
         CDSUNIT_DECLARE_VyukovMPMCCycleQueue( SimpleValue )
         CDSUNIT_DECLARE_StdQueue( SimpleValue )
@@ -228,7 +227,6 @@ namespace queue {
             CDSUNIT_TEST_FCDeque
             CDSUNIT_TEST_SegmentedQueue
             CDSUNIT_TEST_RWQueue
-            CDSUNIT_TEST_MichaelDeque
             CDSUNIT_TEST_TsigasCysleQueue
             CDSUNIT_TEST_VyukovMPMCCycleQueue
             CDSUNIT_TEST_StdQueue

diff --git a/tests/unit/queue/queue_random.cpp b/tests/unit/queue/queue_random.cpp
index a9b7067861c1c2a6caa584a04ecb013f0779874f..e986a2218939e9c9dd0b45510f94aafaa7347221 100644 (file)
--- a/tests/unit/queue/queue_random.cpp
+++ b/tests/unit/queue/queue_random.cpp
@@ -275,7 +275,6 @@ namespace queue {
         CDSUNIT_DECLARE_FCDeque( SimpleValue )
         CDSUNIT_DECLARE_SegmentedQueue( SimpleValue )
         CDSUNIT_DECLARE_RWQueue( SimpleValue )
-        CDSUNIT_DECLARE_MichaelDeque( SimpleValue )
         CDSUNIT_DECLARE_TsigasCysleQueue( SimpleValue )
         CDSUNIT_DECLARE_VyukovMPMCCycleQueue( SimpleValue )
         CDSUNIT_DECLARE_StdQueue( SimpleValue )
@@ -289,7 +288,6 @@ namespace queue {
             CDSUNIT_TEST_FCDeque
             CDSUNIT_TEST_SegmentedQueue
             CDSUNIT_TEST_RWQueue
-            CDSUNIT_TEST_MichaelDeque
             CDSUNIT_TEST_TsigasCysleQueue
             CDSUNIT_TEST_VyukovMPMCCycleQueue
             CDSUNIT_TEST_StdQueue

diff --git a/tests/unit/queue/queue_reader_writer.cpp b/tests/unit/queue/queue_reader_writer.cpp
index 93e9b5f49c612bd94ad69a9d0da733b13a1dbfbe..6a4cfe3de22fb2b222ed2b7191ae4209d13b0715 100644 (file)
--- a/tests/unit/queue/queue_reader_writer.cpp
+++ b/tests/unit/queue/queue_reader_writer.cpp
@@ -342,7 +342,6 @@ namespace queue {
         CDSUNIT_DECLARE_FCDeque( Value )
         CDSUNIT_DECLARE_SegmentedQueue( Value )
         CDSUNIT_DECLARE_RWQueue( Value )
-        CDSUNIT_DECLARE_MichaelDeque( Value )
         CDSUNIT_DECLARE_TsigasCysleQueue( Value )
         CDSUNIT_DECLARE_VyukovMPMCCycleQueue( Value )
         CDSUNIT_DECLARE_StdQueue( Value )
@@ -356,7 +355,6 @@ namespace queue {
             CDSUNIT_TEST_FCDeque
             CDSUNIT_TEST_SegmentedQueue
             CDSUNIT_TEST_RWQueue
-            CDSUNIT_TEST_MichaelDeque
             CDSUNIT_TEST_TsigasCysleQueue
             CDSUNIT_TEST_VyukovMPMCCycleQueue
             CDSUNIT_TEST_StdQueue

diff --git a/tests/unit/queue/queue_type.h b/tests/unit/queue/queue_type.h
index 7004675db022ae21f7bd59223cfdf78082b5f48b..b613bc92ca3ec0326e44b8c2df59a4e3fdc7d766 100644 (file)
--- a/tests/unit/queue/queue_type.h
+++ b/tests/unit/queue/queue_type.h
@@ -26,7 +26,7 @@
 #include <boost/container/deque.hpp>
 
 namespace queue {
-
+    namespace details {
         template <typename T, typename Traits=cds::container::fcdeque::type_traits, class Deque=std::deque<T> >
         class FCDequeL: public cds::container::FCDeque<T, Deque, Traits >
         {
@@ -95,7 +95,7 @@ namespace queue {
             }
         };
 
-    }
+    } // namespace details
 
     template <typename Value>
     struct Types {