From 58cd5ed861249381cdf697ef5b82a64e0f9e4ad3 Mon Sep 17 00:00:00 2001
From: khizmax <libcds.dev@gmail.com>
Date: Sat, 27 Sep 2014 23:03:50 +0400
Subject: [PATCH] Move michael_list_base.h from cds/container to
 cds/container/details

---
 cds/container/{ => details}/michael_list_base.h | 6 +++---
 cds/container/michael_kvlist_hp.h               | 2 +-
 cds/container/michael_kvlist_hrc.h              | 2 +-
 cds/container/michael_kvlist_nogc.h             | 2 +-
 cds/container/michael_kvlist_ptb.h              | 2 +-
 cds/container/michael_kvlist_rcu.h              | 2 +-
 cds/container/michael_list_hp.h                 | 2 +-
 cds/container/michael_list_hrc.h                | 2 +-
 cds/container/michael_list_nogc.h               | 2 +-
 cds/container/michael_list_ptb.h                | 2 +-
 cds/container/michael_list_rcu.h                | 2 +-
 projects/Win/vc12/cds.vcxproj                   | 2 +-
 projects/Win/vc12/cds.vcxproj.filters           | 6 +++---
 tests/test-hdr/ordered_list/hdr_michael.h       | 2 +-
 tests/test-hdr/ordered_list/hdr_michael_kv.h    | 2 +-
 15 files changed, 19 insertions(+), 19 deletions(-)
 rename cds/container/{ => details}/michael_list_base.h (95%)

diff --git a/cds/container/michael_list_base.h b/cds/container/details/michael_list_base.h
similarity index 95%
rename from cds/container/michael_list_base.h
rename to cds/container/details/michael_list_base.h
index 117c5f83..c30785ee 100644
--- a/cds/container/michael_list_base.h
+++ b/cds/container/details/michael_list_base.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_CONTAINER_MICHAEL_LIST_BASE_H
-#define __CDS_CONTAINER_MICHAEL_LIST_BASE_H
+#ifndef __CDS_CONTAINER_DETAILS_MICHAEL_LIST_BASE_H
+#define __CDS_CONTAINER_DETAILS_MICHAEL_LIST_BASE_H
 
 #include <cds/container/details/base.h>
 #include <cds/intrusive/details/michael_list_base.h>
@@ -109,4 +109,4 @@ namespace cds { namespace container {
 }}  // namespace cds::container
 
 
-#endif  // #ifndef __CDS_CONTAINER_MICHAEL_LIST_BASE_H
+#endif  // #ifndef __CDS_CONTAINER_DETAILS_MICHAEL_LIST_BASE_H
diff --git a/cds/container/michael_kvlist_hp.h b/cds/container/michael_kvlist_hp.h
index 59056ed6..3da99256 100644
--- a/cds/container/michael_kvlist_hp.h
+++ b/cds/container/michael_kvlist_hp.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_MICHAEL_KVLIST_HP_H
 #define __CDS_CONTAINER_MICHAEL_KVLIST_HP_H
 
-#include <cds/container/michael_list_base.h>
+#include <cds/container/details/michael_list_base.h>
 #include <cds/intrusive/michael_list_hp.h>
 #include <cds/container/details/make_michael_kvlist.h>
 #include <cds/container/impl/michael_kvlist.h>
diff --git a/cds/container/michael_kvlist_hrc.h b/cds/container/michael_kvlist_hrc.h
index 9a6803bb..8d0e4a1f 100644
--- a/cds/container/michael_kvlist_hrc.h
+++ b/cds/container/michael_kvlist_hrc.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_MICHAEL_KVLIST_HRC_H
 #define __CDS_CONTAINER_MICHAEL_KVLIST_HRC_H
 
-#include <cds/container/michael_list_base.h>
+#include <cds/container/details/michael_list_base.h>
 #include <cds/intrusive/michael_list_hrc.h>
 #include <cds/container/details/make_michael_kvlist.h>
 #include <cds/container/impl/michael_kvlist.h>
diff --git a/cds/container/michael_kvlist_nogc.h b/cds/container/michael_kvlist_nogc.h
index 5a42a8f5..bae83d1b 100644
--- a/cds/container/michael_kvlist_nogc.h
+++ b/cds/container/michael_kvlist_nogc.h
@@ -4,7 +4,7 @@
 #define __CDS_CONTAINER_MICHAEL_KVLIST_NOGC_H
 
 #include <memory>
-#include <cds/container/michael_list_base.h>
+#include <cds/container/details/michael_list_base.h>
 #include <cds/intrusive/michael_list_nogc.h>
 #include <cds/container/details/make_michael_kvlist.h>
 #include <cds/details/functor_wrapper.h>
diff --git a/cds/container/michael_kvlist_ptb.h b/cds/container/michael_kvlist_ptb.h
index 43bc8682..0090dc5c 100644
--- a/cds/container/michael_kvlist_ptb.h
+++ b/cds/container/michael_kvlist_ptb.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_MICHAEL_KVLIST_PTB_H
 #define __CDS_CONTAINER_MICHAEL_KVLIST_PTB_H
 
-#include <cds/container/michael_list_base.h>
+#include <cds/container/details/michael_list_base.h>
 #include <cds/intrusive/michael_list_ptb.h>
 #include <cds/container/details/make_michael_kvlist.h>
 #include <cds/container/impl/michael_kvlist.h>
diff --git a/cds/container/michael_kvlist_rcu.h b/cds/container/michael_kvlist_rcu.h
index d1aed822..aaf03ae7 100644
--- a/cds/container/michael_kvlist_rcu.h
+++ b/cds/container/michael_kvlist_rcu.h
@@ -4,7 +4,7 @@
 #define __CDS_CONTAINER_MICHAEL_KVLIST_RCU_H
 
 #include <memory>
-#include <cds/container/michael_list_base.h>
+#include <cds/container/details/michael_list_base.h>
 #include <cds/intrusive/michael_list_rcu.h>
 #include <cds/container/details/make_michael_kvlist.h>
 #include <cds/ref.h>
diff --git a/cds/container/michael_list_hp.h b/cds/container/michael_list_hp.h
index f1ae1a8d..2ef582ac 100644
--- a/cds/container/michael_list_hp.h
+++ b/cds/container/michael_list_hp.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_MICHAEL_LIST_HP_H
 #define __CDS_CONTAINER_MICHAEL_LIST_HP_H
 
-#include <cds/container/michael_list_base.h>
+#include <cds/container/details/michael_list_base.h>
 #include <cds/intrusive/michael_list_hp.h>
 #include <cds/container/details/make_michael_list.h>
 #include <cds/container/michael_list_impl.h>
diff --git a/cds/container/michael_list_hrc.h b/cds/container/michael_list_hrc.h
index 01cb993b..4df2ee67 100644
--- a/cds/container/michael_list_hrc.h
+++ b/cds/container/michael_list_hrc.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_MICHAEL_LIST_HRC_H
 #define __CDS_CONTAINER_MICHAEL_LIST_HRC_H
 
-#include <cds/container/michael_list_base.h>
+#include <cds/container/details/michael_list_base.h>
 #include <cds/intrusive/michael_list_hrc.h>
 #include <cds/container/details/make_michael_list.h>
 #include <cds/container/michael_list_impl.h>
diff --git a/cds/container/michael_list_nogc.h b/cds/container/michael_list_nogc.h
index 170271c0..abae2284 100644
--- a/cds/container/michael_list_nogc.h
+++ b/cds/container/michael_list_nogc.h
@@ -4,7 +4,7 @@
 #define __CDS_CONTAINER_MICHAEL_LIST_NOGC_H
 
 #include <memory>
-#include <cds/container/michael_list_base.h>
+#include <cds/container/details/michael_list_base.h>
 #include <cds/intrusive/michael_list_nogc.h>
 #include <cds/container/details/make_michael_list.h>
 
diff --git a/cds/container/michael_list_ptb.h b/cds/container/michael_list_ptb.h
index b1f3bfbf..546ec9af 100644
--- a/cds/container/michael_list_ptb.h
+++ b/cds/container/michael_list_ptb.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_MICHAEL_LIST_PTB_H
 #define __CDS_CONTAINER_MICHAEL_LIST_PTB_H
 
-#include <cds/container/michael_list_base.h>
+#include <cds/container/details/michael_list_base.h>
 #include <cds/intrusive/michael_list_ptb.h>
 #include <cds/container/details/make_michael_list.h>
 #include <cds/container/michael_list_impl.h>
diff --git a/cds/container/michael_list_rcu.h b/cds/container/michael_list_rcu.h
index e3b57975..e7b0c09f 100644
--- a/cds/container/michael_list_rcu.h
+++ b/cds/container/michael_list_rcu.h
@@ -4,7 +4,7 @@
 #define __CDS_CONTAINER_MICHAEL_LIST_RCU_H
 
 #include <memory>
-#include <cds/container/michael_list_base.h>
+#include <cds/container/details/michael_list_base.h>
 #include <cds/intrusive/michael_list_rcu.h>
 #include <cds/container/details/make_michael_list.h>
 #include <cds/details/binary_functor_wrapper.h>
diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index 1c1cacdf..2bea9fa4 100644
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -663,6 +663,7 @@
     <ClInclude Include="..\..\..\cds\container\details\make_skip_list_map.h" />
     <ClInclude Include="..\..\..\cds\container\details\make_skip_list_set.h" />
     <ClInclude Include="..\..\..\cds\container\details\make_split_list_set.h" />
+    <ClInclude Include="..\..\..\cds\container\details\michael_list_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" />
@@ -966,7 +967,6 @@
     <ClInclude Include="..\..\..\cds\container\michael_kvlist_hrc.h" />
     <ClInclude Include="..\..\..\cds\container\michael_kvlist_nogc.h" />
     <ClInclude Include="..\..\..\cds\container\michael_kvlist_ptb.h" />
-    <ClInclude Include="..\..\..\cds\container\michael_list_base.h" />
     <ClInclude Include="..\..\..\cds\container\michael_list_hp.h" />
     <ClInclude Include="..\..\..\cds\container\michael_list_hrc.h" />
     <ClInclude Include="..\..\..\cds\container\michael_list_impl.h" />
diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index cbc8fd0f..528e827d 100644
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -659,9 +659,6 @@
     <ClInclude Include="..\..\..\cds\container\michael_kvlist_ptb.h">
       <Filter>Header Files\cds\container</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\container\michael_list_base.h">
-      <Filter>Header Files\cds\container</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\container\michael_list_hp.h">
       <Filter>Header Files\cds\container</Filter>
     </ClInclude>
@@ -1283,5 +1280,8 @@
     <ClInclude Include="..\..\..\cds\container\impl\michael_kvlist.h">
       <Filter>Header Files\cds\container\impl</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\cds\container\details\michael_list_base.h">
+      <Filter>Header Files\cds\container\details</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/test-hdr/ordered_list/hdr_michael.h b/tests/test-hdr/ordered_list/hdr_michael.h
index a0fe03e0..02465fc0 100644
--- a/tests/test-hdr/ordered_list/hdr_michael.h
+++ b/tests/test-hdr/ordered_list/hdr_michael.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "cppunit/cppunit_proxy.h"
-#include <cds/container/michael_list_base.h>
+#include <cds/container/details/michael_list_base.h>
 
 namespace ordlist {
     namespace cc = cds::container;
diff --git a/tests/test-hdr/ordered_list/hdr_michael_kv.h b/tests/test-hdr/ordered_list/hdr_michael_kv.h
index 9d5f3e95..263ee1ab 100644
--- a/tests/test-hdr/ordered_list/hdr_michael_kv.h
+++ b/tests/test-hdr/ordered_list/hdr_michael_kv.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "cppunit/cppunit_proxy.h"
-#include <cds/container/michael_list_base.h>
+#include <cds/container/details/michael_list_base.h>
 
 namespace ordlist {
     namespace cc = cds::container;
-- 
2.34.1