From: khizmax <libcds.dev@gmail.com>
Date: Sat, 27 Sep 2014 15:56:29 +0000 (+0400)
Subject: Move base.h from cds/container to cds/container/details
X-Git-Tag: v2.0.0~272
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=272d21d88df62707d9d9a5bd56a69e8ed8bba51e;p=libcds.git

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
index 0a8372fa..00000000
--- 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 ce0e10cc..2c67bca3 100644
--- 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
index 00000000..69f84c2c
--- /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 27dd2544..c772ffb9 100644
--- 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 ed8bce01..2f99b425 100644
--- 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 a6968f6c..117c5f83 100644
--- 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 e0dd3313..b2cdeb63 100644
--- 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 123bfba9..dda777f1 100644
--- 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 916ef6ca..c144bdb5 100644
--- 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 49807fda..4ee76da3 100644
--- 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 3cc591b5..eabe751f 100644
--- 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 8e7dae7e..10ee11ef 100644
--- 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 b8d4a7c3..96388898 100644
--- 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 9e0234e4..1d7aa899 100644
--- 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 5e46dcfd..a78d07f7 100644
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -656,6 +656,7 @@
     <ClInclude Include="..\..\..\cds\container\cuckoo_base.h" />
     <ClInclude Include="..\..\..\cds\container\cuckoo_map.h" />
     <ClInclude Include="..\..\..\cds\container\cuckoo_set.h" />
+    <ClInclude Include="..\..\..\cds\container\details\base.h" />
     <ClInclude Include="..\..\..\cds\container\details\guarded_ptr_cast.h" />
     <ClInclude Include="..\..\..\cds\container\details\make_skip_list_map.h" />
     <ClInclude Include="..\..\..\cds\container\details\make_skip_list_set.h" />
@@ -945,7 +946,6 @@
     <ClInclude Include="..\..\..\cds\intrusive\treiber_stack.h" />
     <ClInclude Include="..\..\..\cds\intrusive\tsigas_cycle_queue.h" />
     <ClInclude Include="..\..\..\cds\intrusive\vyukov_mpmc_cycle_queue.h" />
-    <ClInclude Include="..\..\..\cds\container\base.h" />
     <ClInclude Include="..\..\..\cds\container\fcdeque.h" />
     <ClInclude Include="..\..\..\cds\container\fcpriority_queue.h" />
     <ClInclude Include="..\..\..\cds\container\fcqueue.h" />
diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index de1260f5..330dd63f 100644
--- 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">
       <Filter>Header Files\cds\intrusive</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\container\base.h">
-      <Filter>Header Files\cds\container</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\container\fcdeque.h">
       <Filter>Header Files\cds\container</Filter>
     </ClInclude>
@@ -1280,5 +1277,8 @@
     <ClInclude Include="..\..\..\cds\intrusive\details\split_list_base.h">
       <Filter>Header Files\cds\intrusive\details</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\cds\container\details\base.h">
+      <Filter>Header Files\cds\container\details</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file