From 050abea3d35bf2649692055f3278484c59e7aec5 Mon Sep 17 00:00:00 2001
From: khizmax <libcds.dev@gmail.com>
Date: Sun, 21 Sep 2014 20:25:59 +0400
Subject: [PATCH] Bugfix for MichaelDeque commits

---
 tests/unit/queue/intrusive_queue_reader_writer.cpp | 2 --
 tests/unit/queue/queue_pop.cpp                     | 2 --
 tests/unit/queue/queue_push.cpp                    | 2 --
 tests/unit/queue/queue_random.cpp                  | 2 --
 tests/unit/queue/queue_reader_writer.cpp           | 2 --
 tests/unit/queue/queue_type.h                      | 4 ++--
 6 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/tests/unit/queue/intrusive_queue_reader_writer.cpp b/tests/unit/queue/intrusive_queue_reader_writer.cpp
index 1c36934e..5010c5e4 100644
--- 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 43843ac9..76dc5b8b 100644
--- 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 79229786..e5e834be 100644
--- 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 a9b70678..e986a221 100644
--- 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 93e9b5f4..6a4cfe3d 100644
--- 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 7004675d..b613bc92 100644
--- 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 {
-- 
2.34.1