Move michael_map_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
new file mode 100644 (file)
index 0000000..976f2de
--- /dev/null
+++ b/cds/container/details/michael_map_base.h
@@ -0,0 +1,36 @@
+//$$CDS-header$$
+
+#ifndef __CDS_CONTAINER_MICHAEL_MAP_BASE_H
+#define __CDS_CONTAINER_MICHAEL_MAP_BASE_H
+
+#include <cds/container/michael_set_base.h>
+
+namespace cds { namespace container {
+
+    /// MichaelHashMap related definitions
+    /** @ingroup cds_nonintrusive_helper
+    */
+    namespace michael_map {
+        /// Type traits for MichaelHashMap class
+        typedef container::michael_set::type_traits  type_traits;
+
+        using container::michael_set::make_traits;
+
+        //@cond
+        namespace details {
+            using michael_set::details::init_hash_bitmask;
+        }
+        //@endcond
+
+    }   // namespace michael_map
+
+    //@cond
+    // Forward declarations
+    template <class GC, class OrderedList, class Traits = michael_map::type_traits>
+    class MichaelHashMap;
+    //@endcond
+
+}}  // namespace cds::container
+
+
+#endif  // ifndef __CDS_CONTAINER_MICHAEL_MAP_BASE_H

diff --git a/cds/container/michael_map.h b/cds/container/michael_map.h
index 605d6af83e9954a6dac786637beca49bb0132c88..6f4a387e49ddbf1365e0435633feae8e41af8f78 100644 (file)
--- a/cds/container/michael_map.h
+++ b/cds/container/michael_map.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_MICHAEL_MAP_H
 #define __CDS_CONTAINER_MICHAEL_MAP_H
 
-#include <cds/container/michael_map_base.h>
+#include <cds/container/details/michael_map_base.h>
 #include <cds/details/allocator.h>
 
 namespace cds { namespace container {

diff --git a/cds/container/michael_map_base.h b/cds/container/michael_map_base.h
deleted file mode 100644 (file)
index 976f2de..0000000
--- a/cds/container/michael_map_base.h
+++ /dev/null
@@ -1,36 +0,0 @@
-//$$CDS-header$$
-
-#ifndef __CDS_CONTAINER_MICHAEL_MAP_BASE_H
-#define __CDS_CONTAINER_MICHAEL_MAP_BASE_H
-
-#include <cds/container/michael_set_base.h>
-
-namespace cds { namespace container {
-
-    /// MichaelHashMap related definitions
-    /** @ingroup cds_nonintrusive_helper
-    */
-    namespace michael_map {
-        /// Type traits for MichaelHashMap class
-        typedef container::michael_set::type_traits  type_traits;
-
-        using container::michael_set::make_traits;
-
-        //@cond
-        namespace details {
-            using michael_set::details::init_hash_bitmask;
-        }
-        //@endcond
-
-    }   // namespace michael_map
-
-    //@cond
-    // Forward declarations
-    template <class GC, class OrderedList, class Traits = michael_map::type_traits>
-    class MichaelHashMap;
-    //@endcond
-
-}}  // namespace cds::container
-
-
-#endif  // ifndef __CDS_CONTAINER_MICHAEL_MAP_BASE_H

diff --git a/cds/container/michael_map_nogc.h b/cds/container/michael_map_nogc.h
index c77d7f93e6f0cce5c7ddaee84bdfa88373a7fa55..20a3e98af896130b1cf82baa8466939d53196682 100644 (file)
--- a/cds/container/michael_map_nogc.h
+++ b/cds/container/michael_map_nogc.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_MICHAEL_MAP_NOGC_H
 #define __CDS_CONTAINER_MICHAEL_MAP_NOGC_H
 
-#include <cds/container/michael_map_base.h>
+#include <cds/container/details/michael_map_base.h>
 #include <cds/gc/nogc.h>
 #include <cds/details/allocator.h>
 

diff --git a/cds/container/michael_map_rcu.h b/cds/container/michael_map_rcu.h
index 4df00403ff163f3d8ab90829c99f18b7cebd7f66..02e886136427b73efc03aa7a52f9283e54a904eb 100644 (file)
--- a/cds/container/michael_map_rcu.h
+++ b/cds/container/michael_map_rcu.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_MICHAEL_MAP_RCU_H
 #define __CDS_CONTAINER_MICHAEL_MAP_RCU_H
 
-#include <cds/container/michael_map_base.h>
+#include <cds/container/details/michael_map_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 a42848688fd6e5f79611ef76af79cff852bcfea6..dc442b0f05553d30e69a5690b92b56c415590ea5 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -664,6 +664,7 @@
     <ClInclude Include="..\..\..\cds\container\details\make_skip_list_set.h" />\r
     <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\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
@@ -973,7 +974,6 @@
     <ClInclude Include="..\..\..\cds\container\michael_list_nogc.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_list_ptb.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_map.h" />\r
-    <ClInclude Include="..\..\..\cds\container\michael_map_base.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

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