From 37c90b6523be2c38f2edd610271ed0d5e2d29c1b Mon Sep 17 00:00:00 2001
From: khizmax <libcds.dev@gmail.com>
Date: Sat, 27 Sep 2014 19:10:06 +0400
Subject: [PATCH] Move cds/intrusive/michael_set_base.h to
 cds/intrusive/details directory

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

diff --git a/cds/container/michael_set_base.h b/cds/container/michael_set_base.h
index b7c2c3c0..29544473 100644
--- a/cds/container/michael_set_base.h
+++ b/cds/container/michael_set_base.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_MICHAEL_SET_BASE_H
 #define __CDS_CONTAINER_MICHAEL_SET_BASE_H
 
-#include <cds/intrusive/michael_set_base.h>
+#include <cds/intrusive/details/michael_set_base.h>
 
 namespace cds { namespace container {
 
diff --git a/cds/intrusive/michael_set_base.h b/cds/intrusive/details/michael_set_base.h
similarity index 97%
rename from cds/intrusive/michael_set_base.h
rename to cds/intrusive/details/michael_set_base.h
index f0fe5946..5792f7f1 100644
--- a/cds/intrusive/michael_set_base.h
+++ b/cds/intrusive/details/michael_set_base.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_INTRUSIVE_MICHAEL_SET_BASE_H
-#define __CDS_INTRUSIVE_MICHAEL_SET_BASE_H
+#ifndef __CDS_INTRUSIVE_DETAILS_MICHAEL_SET_BASE_H
+#define __CDS_INTRUSIVE_DETAILS_MICHAEL_SET_BASE_H
 
 #include <cds/intrusive/details/base.h>
 #include <cds/opt/compare.h>
@@ -204,4 +204,4 @@ namespace cds { namespace intrusive {
 
 }} // namespace cds::intrusive
 
-#endif // #ifndef __CDS_INTRUSIVE_MICHAEL_SET_BASE_H
+#endif // #ifndef __CDS_INTRUSIVE_DETAILS_MICHAEL_SET_BASE_H
diff --git a/cds/intrusive/michael_set.h b/cds/intrusive/michael_set.h
index 27f5435c..d6242b76 100644
--- a/cds/intrusive/michael_set.h
+++ b/cds/intrusive/michael_set.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_INTRUSIVE_MICHAEL_SET_H
 #define __CDS_INTRUSIVE_MICHAEL_SET_H
 
-#include <cds/intrusive/michael_set_base.h>
+#include <cds/intrusive/details/michael_set_base.h>
 #include <cds/details/allocator.h>
 
 namespace cds { namespace intrusive {
diff --git a/cds/intrusive/michael_set_nogc.h b/cds/intrusive/michael_set_nogc.h
index 1196c128..59b542db 100644
--- a/cds/intrusive/michael_set_nogc.h
+++ b/cds/intrusive/michael_set_nogc.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_INTRUSIVE_MICHAEL_SET_NOGC_H
 #define __CDS_INTRUSIVE_MICHAEL_SET_NOGC_H
 
-#include <cds/intrusive/michael_set_base.h>
+#include <cds/intrusive/details/michael_set_base.h>
 #include <cds/gc/nogc.h>
 #include <cds/details/allocator.h>
 
diff --git a/cds/intrusive/michael_set_rcu.h b/cds/intrusive/michael_set_rcu.h
index d155e93d..7c2c80cc 100644
--- a/cds/intrusive/michael_set_rcu.h
+++ b/cds/intrusive/michael_set_rcu.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_INTRUSIVE_MICHAEL_SET_RCU_H
 #define __CDS_INTRUSIVE_MICHAEL_SET_RCU_H
 
-#include <cds/intrusive/michael_set_base.h>
+#include <cds/intrusive/details/michael_set_base.h>
 #include <cds/details/allocator.h>
 
 namespace cds { namespace intrusive {
diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index 048f20c2..c564cb4c 100644
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -741,6 +741,7 @@
     <ClInclude Include="..\..\..\cds\intrusive\details\ellen_bintree_base.h" />
     <ClInclude Include="..\..\..\cds\intrusive\details\lazy_list_base.h" />
     <ClInclude Include="..\..\..\cds\intrusive\details\michael_list_base.h" />
+    <ClInclude Include="..\..\..\cds\intrusive\details\michael_set_base.h" />
     <ClInclude Include="..\..\..\cds\intrusive\details\single_link_struct.h" />
     <ClInclude Include="..\..\..\cds\intrusive\ellen_bintree_hp.h" />
     <ClInclude Include="..\..\..\cds\intrusive\ellen_bintree_ptb.h" />
@@ -932,7 +933,6 @@
     <ClInclude Include="..\..\..\cds\intrusive\michael_list_nogc.h" />
     <ClInclude Include="..\..\..\cds\intrusive\michael_list_ptb.h" />
     <ClInclude Include="..\..\..\cds\intrusive\michael_set.h" />
-    <ClInclude Include="..\..\..\cds\intrusive\michael_set_base.h" />
     <ClInclude Include="..\..\..\cds\intrusive\michael_set_nogc.h" />
     <ClInclude Include="..\..\..\cds\intrusive\moir_queue.h" />
     <ClInclude Include="..\..\..\cds\intrusive\msqueue.h" />
diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index 6697c546..4cb12974 100644
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -578,9 +578,6 @@
     <ClInclude Include="..\..\..\cds\intrusive\michael_set.h">
       <Filter>Header Files\cds\intrusive</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\intrusive\michael_set_base.h">
-      <Filter>Header Files\cds\intrusive</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\intrusive\michael_set_nogc.h">
       <Filter>Header Files\cds\intrusive</Filter>
     </ClInclude>
@@ -1280,5 +1277,8 @@
     <ClInclude Include="..\..\..\cds\intrusive\impl\michael_list.h">
       <Filter>Header Files\cds\intrusive\impl</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\cds\intrusive\details\michael_set_base.h">
+      <Filter>Header Files\cds\intrusive\details</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
2.34.1