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

---
 cds/container/michael_list_base.h                   | 2 +-
 cds/intrusive/{ => details}/michael_list_base.h     | 6 +++---
 cds/intrusive/michael_list_impl.h                   | 2 +-
 cds/intrusive/michael_list_nogc.h                   | 2 +-
 cds/intrusive/michael_list_rcu.h                    | 2 +-
 projects/Win/vc12/cds.vcxproj                       | 2 +-
 projects/Win/vc12/cds.vcxproj.filters               | 6 +++---
 tests/test-hdr/ordered_list/hdr_intrusive_michael.h | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)
 rename cds/intrusive/{ => details}/michael_list_base.h (98%)

diff --git a/cds/container/michael_list_base.h b/cds/container/michael_list_base.h
index 8f010f04..a6968f6c 100644
--- a/cds/container/michael_list_base.h
+++ b/cds/container/michael_list_base.h
@@ -4,7 +4,7 @@
 #define __CDS_CONTAINER_MICHAEL_LIST_BASE_H
 
 #include <cds/container/base.h>
-#include <cds/intrusive/michael_list_base.h>
+#include <cds/intrusive/details/michael_list_base.h>
 #include <cds/urcu/options.h>
 
 namespace cds { namespace container {
diff --git a/cds/intrusive/michael_list_base.h b/cds/intrusive/details/michael_list_base.h
similarity index 98%
rename from cds/intrusive/michael_list_base.h
rename to cds/intrusive/details/michael_list_base.h
index 33861c60..696b200a 100644
--- a/cds/intrusive/michael_list_base.h
+++ b/cds/intrusive/details/michael_list_base.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_INTRUSIVE_MICHAEL_LIST_BASE_H
-#define __CDS_INTRUSIVE_MICHAEL_LIST_BASE_H
+#ifndef __CDS_INTRUSIVE_DETAILS_MICHAEL_LIST_BASE_H
+#define __CDS_INTRUSIVE_DETAILS_MICHAEL_LIST_BASE_H
 
 #include <type_traits>
 #include <cds/intrusive/details/base.h>
@@ -260,4 +260,4 @@ namespace cds { namespace intrusive {
 
 }}   // namespace cds::intrusive
 
-#endif // #ifndef __CDS_INTRUSIVE_MICHAEL_LIST_BASE_H
+#endif // #ifndef __CDS_INTRUSIVE_DETAILS_MICHAEL_LIST_BASE_H
diff --git a/cds/intrusive/michael_list_impl.h b/cds/intrusive/michael_list_impl.h
index fa8e1cb0..6521aa1c 100644
--- a/cds/intrusive/michael_list_impl.h
+++ b/cds/intrusive/michael_list_impl.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_INTRUSIVE_MICHAEL_LIST_IMPL_H
 #define __CDS_INTRUSIVE_MICHAEL_LIST_IMPL_H
 
-#include <cds/intrusive/michael_list_base.h>
+#include <cds/intrusive/details/michael_list_base.h>
 #include <cds/gc/guarded_ptr.h>
 
 namespace cds { namespace intrusive {
diff --git a/cds/intrusive/michael_list_nogc.h b/cds/intrusive/michael_list_nogc.h
index d0d9d824..6f0ace51 100644
--- a/cds/intrusive/michael_list_nogc.h
+++ b/cds/intrusive/michael_list_nogc.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_INTRUSIVE_MICHAEL_LIST_NOGC_H
 #define __CDS_INTRUSIVE_MICHAEL_LIST_NOGC_H
 
-#include <cds/intrusive/michael_list_base.h>
+#include <cds/intrusive/details/michael_list_base.h>
 #include <cds/gc/nogc.h>
 
 namespace cds { namespace intrusive {
diff --git a/cds/intrusive/michael_list_rcu.h b/cds/intrusive/michael_list_rcu.h
index 96e7f191..f57f8172 100644
--- a/cds/intrusive/michael_list_rcu.h
+++ b/cds/intrusive/michael_list_rcu.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_INTRUSIVE_MICHAEL_LIST_RCU_H
 #define __CDS_INTRUSIVE_MICHAEL_LIST_RCU_H
 
-#include <cds/intrusive/michael_list_base.h>
+#include <cds/intrusive/details/michael_list_base.h>
 #include <cds/urcu/details/check_deadlock.h>
 #include <cds/details/binary_functor_wrapper.h>
 #include <cds/urcu/exempt_ptr.h>
diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index 7448966a..97ee2103 100644
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -740,6 +740,7 @@
     <ClInclude Include="..\..\..\cds\intrusive\details\dummy_node_holder.h" />
     <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\single_link_struct.h" />
     <ClInclude Include="..\..\..\cds\intrusive\ellen_bintree_hp.h" />
     <ClInclude Include="..\..\..\cds\intrusive\ellen_bintree_ptb.h" />
@@ -925,7 +926,6 @@
     <ClInclude Include="..\..\..\cds\intrusive\lazy_list_hrc.h" />
     <ClInclude Include="..\..\..\cds\intrusive\lazy_list_nogc.h" />
     <ClInclude Include="..\..\..\cds\intrusive\lazy_list_ptb.h" />
-    <ClInclude Include="..\..\..\cds\intrusive\michael_list_base.h" />
     <ClInclude Include="..\..\..\cds\intrusive\michael_list_hp.h" />
     <ClInclude Include="..\..\..\cds\intrusive\michael_list_hrc.h" />
     <ClInclude Include="..\..\..\cds\intrusive\michael_list_impl.h" />
diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index c366bc2c..1e41f078 100644
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -563,9 +563,6 @@
     <ClInclude Include="..\..\..\cds\intrusive\lazy_list_ptb.h">
       <Filter>Header Files\cds\intrusive</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\intrusive\michael_list_base.h">
-      <Filter>Header Files\cds\intrusive</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\intrusive\michael_list_hp.h">
       <Filter>Header Files\cds\intrusive</Filter>
     </ClInclude>
@@ -1280,5 +1277,8 @@
     <ClInclude Include="..\..\..\cds\intrusive\impl\lazy_list.h">
       <Filter>Header Files\cds\intrusive\impl</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\cds\intrusive\details\michael_list_base.h">
+      <Filter>Header Files\cds\intrusive\details</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/test-hdr/ordered_list/hdr_intrusive_michael.h b/tests/test-hdr/ordered_list/hdr_intrusive_michael.h
index b3a42da9..e30e91bc 100644
--- a/tests/test-hdr/ordered_list/hdr_intrusive_michael.h
+++ b/tests/test-hdr/ordered_list/hdr_intrusive_michael.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "cppunit/cppunit_proxy.h"
-#include <cds/intrusive/michael_list_base.h>
+#include <cds/intrusive/details/michael_list_base.h>
 
 namespace ordlist {
     namespace ci = cds::intrusive;
-- 
2.34.1