From 32129f0b2ac01e0cf9c0479ea43e756c79198c42 Mon Sep 17 00:00:00 2001
From: khizmax <libcds.dev@gmail.com>
Date: Sat, 27 Sep 2014 23:14:04 +0400
Subject: [PATCH] Move michael_set_base.h from cds/container to
 cds/container/details

---
 cds/container/details/michael_map_base.h       | 8 ++++----
 cds/container/{ => details}/michael_set_base.h | 6 +++---
 cds/container/michael_set.h                    | 2 +-
 cds/container/michael_set_nogc.h               | 2 +-
 cds/container/michael_set_rcu.h                | 2 +-
 projects/Win/vc12/cds.vcxproj                  | 2 +-
 projects/Win/vc12/cds.vcxproj.filters          | 6 +++---
 7 files changed, 14 insertions(+), 14 deletions(-)
 rename cds/container/{ => details}/michael_set_base.h (88%)

diff --git a/cds/container/details/michael_map_base.h b/cds/container/details/michael_map_base.h
index 976f2def..6f3a5d63 100644
--- 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/michael_set_base.h b/cds/container/details/michael_set_base.h
similarity index 88%
rename from cds/container/michael_set_base.h
rename to cds/container/details/michael_set_base.h
index 29544473..8eb808ba 100644
--- a/cds/container/michael_set_base.h
+++ b/cds/container/details/michael_set_base.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_CONTAINER_MICHAEL_SET_BASE_H
-#define __CDS_CONTAINER_MICHAEL_SET_BASE_H
+#ifndef __CDS_CONTAINER_DETAILS_MICHAEL_SET_BASE_H
+#define __CDS_CONTAINER_DETAILS_MICHAEL_SET_BASE_H
 
 #include <cds/intrusive/details/michael_set_base.h>
 
@@ -41,4 +41,4 @@ namespace cds { namespace container {
 
 }} // namespace cds::container
 
-#endif // #ifndef __CDS_CONTAINER_MICHAEL_SET_BASE_H
+#endif // #ifndef __CDS_CONTAINER_DETAILS_MICHAEL_SET_BASE_H
diff --git a/cds/container/michael_set.h b/cds/container/michael_set.h
index a4155486..18e8a7b7 100644
--- 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_nogc.h b/cds/container/michael_set_nogc.h
index 8cbe4f57..0f241260 100644
--- 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 65e08632..9001e37f 100644
--- 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 dc442b0f..3acd3fe5 100644
--- 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" />
     <ClInclude Include="..\..\..\cds\container\details\michael_list_base.h" />
     <ClInclude Include="..\..\..\cds\container\details\michael_map_base.h" />
+    <ClInclude Include="..\..\..\cds\container\details\michael_set_base.h" />
     <ClInclude Include="..\..\..\cds\container\ellen_bintree_map_hp.h" />
     <ClInclude Include="..\..\..\cds\container\ellen_bintree_map_ptb.h" />
     <ClInclude Include="..\..\..\cds\container\ellen_bintree_map_rcu.h" />
@@ -976,7 +977,6 @@
     <ClInclude Include="..\..\..\cds\container\michael_map.h" />
     <ClInclude Include="..\..\..\cds\container\michael_map_nogc.h" />
     <ClInclude Include="..\..\..\cds\container\michael_set.h" />
-    <ClInclude Include="..\..\..\cds\container\michael_set_base.h" />
     <ClInclude Include="..\..\..\cds\container\michael_set_nogc.h" />
     <ClInclude Include="..\..\..\cds\container\moir_queue.h" />
     <ClInclude Include="..\..\..\cds\container\msqueue.h" />
diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index fb3587cc..821a2153 100644
--- 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">
       <Filter>Header Files\cds\container</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\container\michael_set_base.h">
-      <Filter>Header Files\cds\container</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\container\michael_set_nogc.h">
       <Filter>Header Files\cds\container</Filter>
     </ClInclude>
@@ -1283,5 +1280,8 @@
     <ClInclude Include="..\..\..\cds\container\details\michael_map_base.h">
       <Filter>Header Files\cds\container\details</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\cds\container\details\michael_set_base.h">
+      <Filter>Header Files\cds\container\details</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
2.34.1