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

diff --git a/cds/container/details/michael_map_base.h b/cds/container/details/michael_map_base.h
index 976f2defb4ba6c2ce3b3669fb7aee4e1feff94e9..6f3a5d63a60e0cdde9dcdb2be69efa3ae70f2e19 100644 (file)
--- a/cds/container/details/michael_map_base.h
+++ b/cds/container/details/michael_map_base.h
@@ -1,9 +1,9 @@
 //$$CDS-header$$
 
-#ifndef __CDS_CONTAINER_MICHAEL_MAP_BASE_H
-#define __CDS_CONTAINER_MICHAEL_MAP_BASE_H
+#ifndef __CDS_CONTAINER_DETAILS_MICHAEL_MAP_BASE_H
+#define __CDS_CONTAINER_DETAILS_MICHAEL_MAP_BASE_H
 
-#include <cds/container/michael_set_base.h>
+#include <cds/container/details/michael_set_base.h>
 
 namespace cds { namespace container {
 
@@ -33,4 +33,4 @@ namespace cds { namespace container {
 }}  // namespace cds::container
 
 
-#endif  // ifndef __CDS_CONTAINER_MICHAEL_MAP_BASE_H
+#endif  // ifndef __CDS_CONTAINER_DETAILS_MICHAEL_MAP_BASE_H

diff --git a/cds/container/details/michael_set_base.h b/cds/container/details/michael_set_base.h
new file mode 100644 (file)
index 0000000..8eb808b
--- /dev/null
+++ b/cds/container/details/michael_set_base.h
@@ -0,0 +1,44 @@
+//$$CDS-header$$
+
+#ifndef __CDS_CONTAINER_DETAILS_MICHAEL_SET_BASE_H
+#define __CDS_CONTAINER_DETAILS_MICHAEL_SET_BASE_H
+
+#include <cds/intrusive/details/michael_set_base.h>
+
+namespace cds { namespace container {
+
+    /// MichaelHashSet related definitions
+    /** @ingroup cds_nonintrusive_helper
+    */
+    namespace michael_set {
+
+        /// Type traits for MichaelHashSet class (typedef for cds::intrusive::michael_set::type_traits)
+        typedef intrusive::michael_set::type_traits  type_traits;
+
+        /// Metafunction converting option list to traits struct
+        /**
+            This is a synonym for intrusive::michael_set::make_traits
+        */
+        template <typename... Options>
+        struct make_traits {
+            typedef typename intrusive::michael_set::make_traits<Options...>::type type  ;   ///< Result of metafunction
+        };
+
+        //@cond
+        namespace details {
+            using intrusive::michael_set::details::init_hash_bitmask;
+            using intrusive::michael_set::details::list_iterator_selector;
+            using intrusive::michael_set::details::iterator;
+        }
+        //@endcond
+    }
+
+    //@cond
+    // Forward declarations
+    template <class GC, class OrderedList, class Traits = michael_set::type_traits>
+    class MichaelHashSet;
+    //@endcond
+
+}} // namespace cds::container
+
+#endif // #ifndef __CDS_CONTAINER_DETAILS_MICHAEL_SET_BASE_H

diff --git a/cds/container/michael_set.h b/cds/container/michael_set.h
index a41554860feceee66d754eec2c10c2579b7a00e7..18e8a7b7a7cd9ebe22924783f96ed19a72b2bacd 100644 (file)
--- a/cds/container/michael_set.h
+++ b/cds/container/michael_set.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_MICHAEL_SET_H
 #define __CDS_CONTAINER_MICHAEL_SET_H
 
-#include <cds/container/michael_set_base.h>
+#include <cds/container/details/michael_set_base.h>
 #include <cds/details/allocator.h>
 
 namespace cds { namespace container {

diff --git a/cds/container/michael_set_base.h b/cds/container/michael_set_base.h
deleted file mode 100644 (file)
index 2954447..0000000
--- a/cds/container/michael_set_base.h
+++ /dev/null
@@ -1,44 +0,0 @@
-//$$CDS-header$$
-
-#ifndef __CDS_CONTAINER_MICHAEL_SET_BASE_H
-#define __CDS_CONTAINER_MICHAEL_SET_BASE_H
-
-#include <cds/intrusive/details/michael_set_base.h>
-
-namespace cds { namespace container {
-
-    /// MichaelHashSet related definitions
-    /** @ingroup cds_nonintrusive_helper
-    */
-    namespace michael_set {
-
-        /// Type traits for MichaelHashSet class (typedef for cds::intrusive::michael_set::type_traits)
-        typedef intrusive::michael_set::type_traits  type_traits;
-
-        /// Metafunction converting option list to traits struct
-        /**
-            This is a synonym for intrusive::michael_set::make_traits
-        */
-        template <typename... Options>
-        struct make_traits {
-            typedef typename intrusive::michael_set::make_traits<Options...>::type type  ;   ///< Result of metafunction
-        };
-
-        //@cond
-        namespace details {
-            using intrusive::michael_set::details::init_hash_bitmask;
-            using intrusive::michael_set::details::list_iterator_selector;
-            using intrusive::michael_set::details::iterator;
-        }
-        //@endcond
-    }
-
-    //@cond
-    // Forward declarations
-    template <class GC, class OrderedList, class Traits = michael_set::type_traits>
-    class MichaelHashSet;
-    //@endcond
-
-}} // namespace cds::container
-
-#endif // #ifndef __CDS_CONTAINER_MICHAEL_SET_BASE_H

diff --git a/cds/container/michael_set_nogc.h b/cds/container/michael_set_nogc.h
index 8cbe4f5786877eebafaea7a68fb8ce47801e6bcd..0f2412601aebe66a8473f185eb82d0413c352ee1 100644 (file)
--- a/cds/container/michael_set_nogc.h
+++ b/cds/container/michael_set_nogc.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_MICHAEL_SET_NOGC_H
 #define __CDS_CONTAINER_MICHAEL_SET_NOGC_H
 
-#include <cds/container/michael_set_base.h>
+#include <cds/container/details/michael_set_base.h>
 #include <cds/gc/nogc.h>
 #include <cds/details/allocator.h>
 

diff --git a/cds/container/michael_set_rcu.h b/cds/container/michael_set_rcu.h
index 65e086329901e05523290d5b02520566e92b9bc3..9001e37f8be73c630d22ab5292051b73f035ee0d 100644 (file)
--- a/cds/container/michael_set_rcu.h
+++ b/cds/container/michael_set_rcu.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_MICHAEL_SET_RCU_H
 #define __CDS_CONTAINER_MICHAEL_SET_RCU_H
 
-#include <cds/container/michael_set_base.h>
+#include <cds/container/details/michael_set_base.h>
 #include <cds/details/allocator.h>
 
 namespace cds { namespace container {

diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index dc442b0f05553d30e69a5690b92b56c415590ea5..3acd3fe59ad33fd1e4cf023f04c00d448846e262 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -665,6 +665,7 @@
     <ClInclude Include="..\..\..\cds\container\details\make_split_list_set.h" />\r
     <ClInclude Include="..\..\..\cds\container\details\michael_list_base.h" />\r
     <ClInclude Include="..\..\..\cds\container\details\michael_map_base.h" />\r
+    <ClInclude Include="..\..\..\cds\container\details\michael_set_base.h" />\r
     <ClInclude Include="..\..\..\cds\container\ellen_bintree_map_hp.h" />\r
     <ClInclude Include="..\..\..\cds\container\ellen_bintree_map_ptb.h" />\r
     <ClInclude Include="..\..\..\cds\container\ellen_bintree_map_rcu.h" />\r
@@ -976,7 +977,6 @@
     <ClInclude Include="..\..\..\cds\container\michael_map.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_map_nogc.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_set.h" />\r
-    <ClInclude Include="..\..\..\cds\container\michael_set_base.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_set_nogc.h" />\r
     <ClInclude Include="..\..\..\cds\container\moir_queue.h" />\r
     <ClInclude Include="..\..\..\cds\container\msqueue.h" />\r

diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index fb3587cc5c44e6ff4606303659673f0340a0088c..821a2153f76524887558d7cd1f7f11bc25caa0f0 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -680,9 +680,6 @@
     <ClInclude Include="..\..\..\cds\container\michael_set.h">\r
       <Filter>Header Files\cds\container</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\container\michael_set_base.h">\r
-      <Filter>Header Files\cds\container</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\..\cds\container\michael_set_nogc.h">\r
       <Filter>Header Files\cds\container</Filter>\r
     </ClInclude>\r
@@ -1283,5 +1280,8 @@
     <ClInclude Include="..\..\..\cds\container\details\michael_map_base.h">\r
       <Filter>Header Files\cds\container\details</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\..\cds\container\details\michael_set_base.h">\r
+      <Filter>Header Files\cds\container\details</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file