Move base.h from cds/container to cds/container/details

diff --git a/cds/container/base.h b/cds/container/base.h
deleted file mode 100644 (file)
index 0a8372f..0000000
--- a/cds/container/base.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//$$CDS-header$$
-
-#ifndef __CDS_CONTAINER_BASE_H
-#define __CDS_CONTAINER_BASE_H
-
-#include <cds/intrusive/details/base.h>
-#include <cds/details/allocator.h>
-
-namespace cds {
-
-/// Standard (non-intrusive) containers
-/**
-    @ingroup cds_nonintrusive_containers
-    This namespace contains implementations of non-intrusive (std-like) lock-free containers.
-*/
-namespace container {
-
-    /// Common options for non-intrusive containers
-    /** @ingroup cds_nonintrusive_helper
-        This namespace contains options for non-intrusive containers that is, in general, the same as for the intrusive containers.
-        It imports all definitions from cds::opt and cds::intrusive::opt namespaces
-    */
-    namespace opt {
-        using namespace cds::intrusive::opt;
-    }   // namespace opt
-
-    /// @defgroup cds_nonintrusive_containers Non-intrusive containers
-    /** @defgroup cds_nonintrusive_helper Helper structs for non-intrusive containers
-        @ingroup cds_nonintrusive_containers
-    */
-
-    /** @defgroup cds_nonintrusive_stack Stack
-        @ingroup cds_nonintrusive_containers
-    */
-    /** @defgroup cds_nonintrusive_queue Queue
-        @ingroup cds_nonintrusive_containers
-    */
-    /** @defgroup cds_nonintrusive_deque Deque
-        @ingroup cds_nonintrusive_containers
-    */
-    /** @defgroup cds_nonintrusive_priority_queue Priority queue
-        @ingroup cds_nonintrusive_containers
-    */
-    /** @defgroup cds_nonintrusive_map Map
-        @ingroup cds_nonintrusive_containers
-    */
-    /** @defgroup cds_nonintrusive_set Set
-        @ingroup cds_nonintrusive_containers
-    */
-    /** @defgroup cds_nonintrusive_list List
-        @ingroup cds_nonintrusive_containers
-    */
-    /** @defgroup cds_nonintrusive_tree Tree
-        @ingroup cds_nonintrusive_containers
-    */
-
-}   // namespace container
-}   // namespace cds
-
-#endif // #ifndef __CDS_CONTAINER_BASE_H

diff --git a/cds/container/basket_queue.h b/cds/container/basket_queue.h
index ce0e10ccd2506d7b4b99704ff7375815def78dba..2c67bca332022ac6125725c47b048fba3d68fdfa 100644 (file)
--- a/cds/container/basket_queue.h
+++ b/cds/container/basket_queue.h
@@ -5,7 +5,7 @@
 
 #include <memory>
 #include <cds/intrusive/basket_queue.h>
-#include <cds/container/base.h>
+#include <cds/container/details/base.h>
 #include <cds/ref.h>
 #include <cds/details/trivial_assign.h>
 

diff --git a/cds/container/details/base.h b/cds/container/details/base.h
new file mode 100644 (file)
index 0000000..69f84c2
--- /dev/null
+++ b/cds/container/details/base.h
@@ -0,0 +1,60 @@
+//$$CDS-header$$
+
+#ifndef __CDS_CONTAINER_DETAILS_BASE_H
+#define __CDS_CONTAINER_DETAILS_BASE_H
+
+#include <cds/intrusive/details/base.h>
+#include <cds/details/allocator.h>
+
+namespace cds {
+
+/// Standard (non-intrusive) containers
+/**
+    @ingroup cds_nonintrusive_containers
+    This namespace contains implementations of non-intrusive (std-like) lock-free containers.
+*/
+namespace container {
+
+    /// Common options for non-intrusive containers
+    /** @ingroup cds_nonintrusive_helper
+        This namespace contains options for non-intrusive containers that is, in general, the same as for the intrusive containers.
+        It imports all definitions from cds::opt and cds::intrusive::opt namespaces
+    */
+    namespace opt {
+        using namespace cds::intrusive::opt;
+    }   // namespace opt
+
+    /// @defgroup cds_nonintrusive_containers Non-intrusive containers
+    /** @defgroup cds_nonintrusive_helper Helper structs for non-intrusive containers
+        @ingroup cds_nonintrusive_containers
+    */
+
+    /** @defgroup cds_nonintrusive_stack Stack
+        @ingroup cds_nonintrusive_containers
+    */
+    /** @defgroup cds_nonintrusive_queue Queue
+        @ingroup cds_nonintrusive_containers
+    */
+    /** @defgroup cds_nonintrusive_deque Deque
+        @ingroup cds_nonintrusive_containers
+    */
+    /** @defgroup cds_nonintrusive_priority_queue Priority queue
+        @ingroup cds_nonintrusive_containers
+    */
+    /** @defgroup cds_nonintrusive_map Map
+        @ingroup cds_nonintrusive_containers
+    */
+    /** @defgroup cds_nonintrusive_set Set
+        @ingroup cds_nonintrusive_containers
+    */
+    /** @defgroup cds_nonintrusive_list List
+        @ingroup cds_nonintrusive_containers
+    */
+    /** @defgroup cds_nonintrusive_tree Tree
+        @ingroup cds_nonintrusive_containers
+    */
+
+}   // namespace container
+}   // namespace cds
+
+#endif // #ifndef __CDS_CONTAINER_DETAILS_BASE_H

diff --git a/cds/container/ellen_bintree_base.h b/cds/container/ellen_bintree_base.h
index 27dd2544de1b720f0aa9160eef8e8df0d4b6218b..c772ffb93887828a14dfa1a363c9d066e3dbea60 100644 (file)
--- a/cds/container/ellen_bintree_base.h
+++ b/cds/container/ellen_bintree_base.h
@@ -4,7 +4,7 @@
 #define __CDS_CONTAINER_ELLEN_BINTREE_BASE_H
 
 #include <cds/intrusive/details/ellen_bintree_base.h>
-#include <cds/container/base.h>
+#include <cds/container/details/base.h>
 #include <cds/opt/compare.h>
 #include <cds/details/binary_functor_wrapper.h>
 

diff --git a/cds/container/lazy_list_base.h b/cds/container/lazy_list_base.h
index ed8bce01d33e0c61cae16b5e357a0035f1fd611a..2f99b42515e3d702679719c87ca7d45e08807575 100644 (file)
--- a/cds/container/lazy_list_base.h
+++ b/cds/container/lazy_list_base.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_LAZY_LIST_BASE_H
 #define __CDS_CONTAINER_LAZY_LIST_BASE_H
 
-#include <cds/container/base.h>
+#include <cds/container/details/base.h>
 #include <cds/intrusive/details/lazy_list_base.h>
 #include <cds/urcu/options.h>
 

diff --git a/cds/container/michael_list_base.h b/cds/container/michael_list_base.h
index a6968f6cfd1be354b3282676707429cbc0b74003..117c5f8375bd7dfc63f8b31ee130218f9488111a 100644 (file)
--- a/cds/container/michael_list_base.h
+++ b/cds/container/michael_list_base.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_MICHAEL_LIST_BASE_H
 #define __CDS_CONTAINER_MICHAEL_LIST_BASE_H
 
-#include <cds/container/base.h>
+#include <cds/container/details/base.h>
 #include <cds/intrusive/details/michael_list_base.h>
 #include <cds/urcu/options.h>
 

diff --git a/cds/container/moir_queue.h b/cds/container/moir_queue.h
index e0dd331329fd13bba7c7a442355d14c7a86f6667..b2cdeb63cc2943ea9ccde4e1f0eccab2d61b381a 100644 (file)
--- a/cds/container/moir_queue.h
+++ b/cds/container/moir_queue.h
@@ -6,7 +6,7 @@
 #include <memory>
 #include <cds/intrusive/moir_queue.h>
 #include <cds/intrusive/details/queue_stat.h>
-#include <cds/container/base.h>
+#include <cds/container/details/base.h>
 #include <cds/ref.h>
 #include <cds/details/trivial_assign.h>
 

diff --git a/cds/container/mspriority_queue.h b/cds/container/mspriority_queue.h
index 123bfba9b981d5237d849a664d22c0ab87afc9e1..dda777f109036e4dbd88cdaad48293ebc4a9e9ec 100644 (file)
--- a/cds/container/mspriority_queue.h
+++ b/cds/container/mspriority_queue.h
@@ -4,7 +4,7 @@
 #define __CDS_CONTAINER_MSPRIORITY_QUEUE_H
 
 #include <memory>
-#include <cds/container/base.h>
+#include <cds/container/details/base.h>
 #include <cds/intrusive/mspriority_queue.h>
 
 namespace cds { namespace container {

diff --git a/cds/container/msqueue.h b/cds/container/msqueue.h
index 916ef6cab8248d883b3b94d6ddcfc157f6a2642e..c144bdb5e4b28a90c64392508ae5ee0a1fd56c35 100644 (file)
--- a/cds/container/msqueue.h
+++ b/cds/container/msqueue.h
@@ -5,7 +5,7 @@
 
 #include <memory>
 #include <cds/intrusive/msqueue.h>
-#include <cds/container/base.h>
+#include <cds/container/details/base.h>
 #include <cds/ref.h>
 #include <cds/details/trivial_assign.h>
 

diff --git a/cds/container/optimistic_queue.h b/cds/container/optimistic_queue.h
index 49807fdae4af99a5d37c462c6010779f32dac138..4ee76da3a3ef98fd57e6507fd9c86bc5ea5dbae8 100644 (file)
--- a/cds/container/optimistic_queue.h
+++ b/cds/container/optimistic_queue.h
@@ -5,7 +5,7 @@
 
 #include <memory>
 #include <cds/intrusive/optimistic_queue.h>
-#include <cds/container/base.h>
+#include <cds/container/details/base.h>
 #include <cds/ref.h>
 #include <cds/details/trivial_assign.h>
 

diff --git a/cds/container/skip_list_base.h b/cds/container/skip_list_base.h
index 3cc591b57f23c3f9349efe7cbbc9d00b295b18eb..eabe751f20bf37bea697e10ee59bb97132890b04 100644 (file)
--- a/cds/container/skip_list_base.h
+++ b/cds/container/skip_list_base.h
@@ -4,7 +4,7 @@
 #define __CDS_CONTAINER_SKIP_LIST_BASE_H
 
 #include <cds/intrusive/details/skip_list_base.h>
-#include <cds/container/base.h>
+#include <cds/container/details/base.h>
 
 namespace cds { namespace container {
 

diff --git a/cds/container/treiber_stack.h b/cds/container/treiber_stack.h
index 8e7dae7e6ba37694411dbddd87ee623c20ccde27..10ee11ef3c953d68b35569f841feb7b9fdfcf388 100644 (file)
--- a/cds/container/treiber_stack.h
+++ b/cds/container/treiber_stack.h
@@ -5,7 +5,7 @@
 
 #include <memory>
 #include <cds/intrusive/treiber_stack.h>
-#include <cds/container/base.h>
+#include <cds/container/details/base.h>
 
 namespace cds { namespace container {
 

diff --git a/cds/container/tsigas_cycle_queue.h b/cds/container/tsigas_cycle_queue.h
index b8d4a7c35eec55d8f10d3db3ea1e89d8e298e06e..96388898f273d5d55e6b7a8009e5e55d461698da 100644 (file)
--- a/cds/container/tsigas_cycle_queue.h
+++ b/cds/container/tsigas_cycle_queue.h
@@ -5,7 +5,7 @@
 
 #include <memory>
 #include <cds/intrusive/tsigas_cycle_queue.h>
-#include <cds/container/base.h>
+#include <cds/container/details/base.h>
 #include <cds/details/trivial_assign.h>
 
 namespace cds { namespace container {

diff --git a/cds/container/vyukov_mpmc_cycle_queue.h b/cds/container/vyukov_mpmc_cycle_queue.h
index 9e0234e4c38d443657d68fb9a342326579ce45f4..1d7aa89974f277d199e08292888e9a8a44815175 100644 (file)
--- a/cds/container/vyukov_mpmc_cycle_queue.h
+++ b/cds/container/vyukov_mpmc_cycle_queue.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_VYUKOV_MPMC_CYCLE_QUEUE_H
 #define __CDS_CONTAINER_VYUKOV_MPMC_CYCLE_QUEUE_H
 
-#include <cds/container/base.h>
+#include <cds/container/details/base.h>
 #include <cds/opt/buffer.h>
 #include <cds/opt/value_cleaner.h>
 #include <cds/cxx11_atomic.h>

diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index 5e46dcfd1b803d066070733619956c75031ad8b8..a78d07f72dd9772cfb5af06f0cf86e94edaa059d 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -656,6 +656,7 @@
     <ClInclude Include="..\..\..\cds\container\cuckoo_base.h" />\r
     <ClInclude Include="..\..\..\cds\container\cuckoo_map.h" />\r
     <ClInclude Include="..\..\..\cds\container\cuckoo_set.h" />\r
+    <ClInclude Include="..\..\..\cds\container\details\base.h" />\r
     <ClInclude Include="..\..\..\cds\container\details\guarded_ptr_cast.h" />\r
     <ClInclude Include="..\..\..\cds\container\details\make_skip_list_map.h" />\r
     <ClInclude Include="..\..\..\cds\container\details\make_skip_list_set.h" />\r
@@ -945,7 +946,6 @@
     <ClInclude Include="..\..\..\cds\intrusive\treiber_stack.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\tsigas_cycle_queue.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\vyukov_mpmc_cycle_queue.h" />\r
-    <ClInclude Include="..\..\..\cds\container\base.h" />\r
     <ClInclude Include="..\..\..\cds\container\fcdeque.h" />\r
     <ClInclude Include="..\..\..\cds\container\fcpriority_queue.h" />\r
     <ClInclude Include="..\..\..\cds\container\fcqueue.h" />\r

diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index de1260f5ecb1b119de418498f0639bba39957c50..330dd63f4de3928ca76c43f9badf9314eb8b77ca 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -608,9 +608,6 @@
     <ClInclude Include="..\..\..\cds\intrusive\vyukov_mpmc_cycle_queue.h">\r
       <Filter>Header Files\cds\intrusive</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\container\base.h">\r
-      <Filter>Header Files\cds\container</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\..\cds\container\fcdeque.h">\r
       <Filter>Header Files\cds\container</Filter>\r
     </ClInclude>\r
@@ -1280,5 +1277,8 @@
     <ClInclude Include="..\..\..\cds\intrusive\details\split_list_base.h">\r
       <Filter>Header Files\cds\intrusive\details</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\..\cds\container\details\base.h">\r
+      <Filter>Header Files\cds\container\details</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file