From 6f0566a4d0f7d7de00dbac445cb2d0fd01ebef37 Mon Sep 17 00:00:00 2001
From: khizmax <libcds.dev@gmail.com>
Date: Sat, 27 Sep 2014 19:45:04 +0400
Subject: [PATCH] Moce skip_list_base.h from cds/intrusive
 tocds/intrusive/details

---
 cds/container/skip_list_base.h               | 2 +-
 cds/intrusive/{ => details}/skip_list_base.h | 6 +++---
 cds/intrusive/skip_list_impl.h               | 2 +-
 cds/intrusive/skip_list_nogc.h               | 2 +-
 cds/intrusive/skip_list_rcu.h                | 2 +-
 projects/Win/vc12/cds.vcxproj                | 2 +-
 projects/Win/vc12/cds.vcxproj.filters        | 6 +++---
 tests/unit/print_skip_list_stat.h            | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)
 rename cds/intrusive/{ => details}/skip_list_base.h (99%)

diff --git a/cds/container/skip_list_base.h b/cds/container/skip_list_base.h
index bf33f0cc..3cc591b5 100644
--- a/cds/container/skip_list_base.h
+++ b/cds/container/skip_list_base.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_SKIP_LIST_BASE_H
 #define __CDS_CONTAINER_SKIP_LIST_BASE_H
 
-#include <cds/intrusive/skip_list_base.h>
+#include <cds/intrusive/details/skip_list_base.h>
 #include <cds/container/base.h>
 
 namespace cds { namespace container {
diff --git a/cds/intrusive/skip_list_base.h b/cds/intrusive/details/skip_list_base.h
similarity index 99%
rename from cds/intrusive/skip_list_base.h
rename to cds/intrusive/details/skip_list_base.h
index 5419dc4e..257e2bba 100644
--- a/cds/intrusive/skip_list_base.h
+++ b/cds/intrusive/details/skip_list_base.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_INTRUSIVE_SKIP_LIST_BASE_H
-#define __CDS_INTRUSIVE_SKIP_LIST_BASE_H
+#ifndef __CDS_INTRUSIVE_DETAILS_SKIP_LIST_BASE_H
+#define __CDS_INTRUSIVE_DETAILS_SKIP_LIST_BASE_H
 
 #include <cds/intrusive/details/base.h>
 #include <cds/details/marked_ptr.h>
@@ -651,4 +651,4 @@ namespace cds { namespace intrusive {
 
 }}   // namespace cds::intrusive
 
-#endif // #ifndef __CDS_INTRUSIVE_SKIP_LIST_BASE_H
+#endif // #ifndef __CDS_INTRUSIVE_DETAILS_SKIP_LIST_BASE_H
diff --git a/cds/intrusive/skip_list_impl.h b/cds/intrusive/skip_list_impl.h
index 91e2acd4..034222a1 100644
--- a/cds/intrusive/skip_list_impl.h
+++ b/cds/intrusive/skip_list_impl.h
@@ -5,7 +5,7 @@
 
 #include <type_traits>
 #include <memory>
-#include <cds/intrusive/skip_list_base.h>
+#include <cds/intrusive/details/skip_list_base.h>
 #include <cds/opt/compare.h>
 #include <cds/ref.h>
 #include <cds/details/binary_functor_wrapper.h>
diff --git a/cds/intrusive/skip_list_nogc.h b/cds/intrusive/skip_list_nogc.h
index 5564479e..cb1ca410 100644
--- a/cds/intrusive/skip_list_nogc.h
+++ b/cds/intrusive/skip_list_nogc.h
@@ -6,7 +6,7 @@
 #include <type_traits>
 #include <memory>
 #include <cds/gc/nogc.h>
-#include <cds/intrusive/skip_list_base.h>
+#include <cds/intrusive/details/skip_list_base.h>
 #include <cds/opt/compare.h>
 #include <cds/ref.h>
 #include <cds/details/binary_functor_wrapper.h>
diff --git a/cds/intrusive/skip_list_rcu.h b/cds/intrusive/skip_list_rcu.h
index 9d74a974..314d1700 100644
--- a/cds/intrusive/skip_list_rcu.h
+++ b/cds/intrusive/skip_list_rcu.h
@@ -5,7 +5,7 @@
 
 #include <type_traits>
 #include <memory>
-#include <cds/intrusive/skip_list_base.h>
+#include <cds/intrusive/details/skip_list_base.h>
 #include <cds/opt/compare.h>
 #include <cds/ref.h>
 #include <cds/urcu/details/check_deadlock.h>
diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index 6dbf8cbe..71c00816 100644
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -745,6 +745,7 @@
     <ClInclude Include="..\..\..\cds\intrusive\details\node_traits.h" />
     <ClInclude Include="..\..\..\cds\intrusive\details\queue_stat.h" />
     <ClInclude Include="..\..\..\cds\intrusive\details\single_link_struct.h" />
+    <ClInclude Include="..\..\..\cds\intrusive\details\skip_list_base.h" />
     <ClInclude Include="..\..\..\cds\intrusive\ellen_bintree_hp.h" />
     <ClInclude Include="..\..\..\cds\intrusive\ellen_bintree_ptb.h" />
     <ClInclude Include="..\..\..\cds\intrusive\ellen_bintree_rcu.h" />
@@ -756,7 +757,6 @@
     <ClInclude Include="..\..\..\cds\intrusive\michael_set_rcu.h" />
     <ClInclude Include="..\..\..\cds\intrusive\mspriority_queue.h" />
     <ClInclude Include="..\..\..\cds\intrusive\options.h" />
-    <ClInclude Include="..\..\..\cds\intrusive\skip_list_base.h" />
     <ClInclude Include="..\..\..\cds\intrusive\skip_list_hp.h" />
     <ClInclude Include="..\..\..\cds\intrusive\skip_list_hrc.h" />
     <ClInclude Include="..\..\..\cds\intrusive\skip_list_impl.h" />
diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index 15711764..7be01398 100644
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -953,9 +953,6 @@
     <ClInclude Include="..\..\..\cds\gc\exception.h">
       <Filter>Header Files\cds\gc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\intrusive\skip_list_base.h">
-      <Filter>Header Files\cds\intrusive</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\intrusive\skip_list_hp.h">
       <Filter>Header Files\cds\intrusive</Filter>
     </ClInclude>
@@ -1280,5 +1277,8 @@
     <ClInclude Include="..\..\..\cds\intrusive\details\queue_stat.h">
       <Filter>Header Files\cds\intrusive\details</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\cds\intrusive\details\skip_list_base.h">
+      <Filter>Header Files\cds\intrusive\details</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/unit/print_skip_list_stat.h b/tests/unit/print_skip_list_stat.h
index 4e8ec6fe..7e40c1cc 100644
--- a/tests/unit/print_skip_list_stat.h
+++ b/tests/unit/print_skip_list_stat.h
@@ -3,7 +3,7 @@
 #ifndef __UNIT_PRINT_SKIP_LIST_STAT_H
 #define __UNIT_PRINT_SKIP_LIST_STAT_H
 
-#include <cds/intrusive/skip_list_base.h>
+#include <cds/intrusive/details/skip_list_base.h>
 #include <ostream>
 
 namespace std {
-- 
2.34.1