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

---
 cds/container/details/make_skip_list_map.h   | 2 +-
 cds/container/details/make_skip_list_set.h   | 2 +-
 cds/container/{ => details}/skip_list_base.h | 6 +++---
 cds/container/skip_list_map_hp.h             | 2 +-
 cds/container/skip_list_map_hrc.h            | 2 +-
 cds/container/skip_list_map_ptb.h            | 2 +-
 cds/container/skip_list_map_rcu.h            | 2 +-
 cds/container/skip_list_set_hp.h             | 2 +-
 cds/container/skip_list_set_hrc.h            | 2 +-
 cds/container/skip_list_set_nogc.h           | 2 +-
 cds/container/skip_list_set_ptb.h            | 2 +-
 projects/Win/vc12/cds.vcxproj                | 2 +-
 projects/Win/vc12/cds.vcxproj.filters        | 6 +++---
 13 files changed, 17 insertions(+), 17 deletions(-)
 rename cds/container/{ => details}/skip_list_base.h (98%)

diff --git a/cds/container/details/make_skip_list_map.h b/cds/container/details/make_skip_list_map.h
index 69c72a47..ae87e8a3 100644
--- a/cds/container/details/make_skip_list_map.h
+++ b/cds/container/details/make_skip_list_map.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_DETAILS_MAKE_SKIP_LIST_MAP_H
 #define __CDS_CONTAINER_DETAILS_MAKE_SKIP_LIST_MAP_H
 
-#include <cds/container/skip_list_base.h>
+#include <cds/container/details/skip_list_base.h>
 #include <cds/details/binary_functor_wrapper.h>
 
 //@cond
diff --git a/cds/container/details/make_skip_list_set.h b/cds/container/details/make_skip_list_set.h
index 061d24b6..7f7392af 100644
--- a/cds/container/details/make_skip_list_set.h
+++ b/cds/container/details/make_skip_list_set.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_DETAILS_MAKE_SKIP_LIST_SET_H
 #define __CDS_CONTAINER_DETAILS_MAKE_SKIP_LIST_SET_H
 
-#include <cds/container/skip_list_base.h>
+#include <cds/container/details/skip_list_base.h>
 #include <cds/details/binary_functor_wrapper.h>
 
 //@cond
diff --git a/cds/container/skip_list_base.h b/cds/container/details/skip_list_base.h
similarity index 98%
rename from cds/container/skip_list_base.h
rename to cds/container/details/skip_list_base.h
index eabe751f..85499c06 100644
--- a/cds/container/skip_list_base.h
+++ b/cds/container/details/skip_list_base.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_CONTAINER_SKIP_LIST_BASE_H
-#define __CDS_CONTAINER_SKIP_LIST_BASE_H
+#ifndef __CDS_CONTAINER_DETAILS_SKIP_LIST_BASE_H
+#define __CDS_CONTAINER_DETAILS_SKIP_LIST_BASE_H
 
 #include <cds/intrusive/details/skip_list_base.h>
 #include <cds/container/details/base.h>
@@ -294,4 +294,4 @@ namespace cds { namespace container {
 
 }} // namespace cds::container
 
-#endif // #ifndef __CDS_CONTAINER_SKIP_LIST_BASE_H
+#endif // #ifndef __CDS_CONTAINER_DETAILS_SKIP_LIST_BASE_H
diff --git a/cds/container/skip_list_map_hp.h b/cds/container/skip_list_map_hp.h
index 7665aa53..2db50157 100644
--- a/cds/container/skip_list_map_hp.h
+++ b/cds/container/skip_list_map_hp.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_SKIP_LIST_MAP_HP_H
 #define __CDS_CONTAINER_SKIP_LIST_MAP_HP_H
 
-#include <cds/container/skip_list_base.h>
+#include <cds/container/details/skip_list_base.h>
 #include <cds/intrusive/skip_list_hp.h>
 #include <cds/container/details/make_skip_list_map.h>
 #include <cds/container/skip_list_map_impl.h>
diff --git a/cds/container/skip_list_map_hrc.h b/cds/container/skip_list_map_hrc.h
index 53d230e9..c573d096 100644
--- a/cds/container/skip_list_map_hrc.h
+++ b/cds/container/skip_list_map_hrc.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_SKIP_LIST_MAP_HRC_H
 #define __CDS_CONTAINER_SKIP_LIST_MAP_HRC_H
 
-#include <cds/container/skip_list_base.h>
+#include <cds/container/details/skip_list_base.h>
 #include <cds/intrusive/skip_list_hrc.h>
 #include <cds/container/details/make_skip_list_map.h>
 #include <cds/container/skip_list_map_impl.h>
diff --git a/cds/container/skip_list_map_ptb.h b/cds/container/skip_list_map_ptb.h
index 60cda768..64536b49 100644
--- a/cds/container/skip_list_map_ptb.h
+++ b/cds/container/skip_list_map_ptb.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_SKIP_LIST_SET_PTB_H
 #define __CDS_CONTAINER_SKIP_LIST_SET_PTB_H
 
-#include <cds/container/skip_list_base.h>
+#include <cds/container/details/skip_list_base.h>
 #include <cds/intrusive/skip_list_ptb.h>
 #include <cds/container/details/make_skip_list_map.h>
 #include <cds/container/skip_list_map_impl.h>
diff --git a/cds/container/skip_list_map_rcu.h b/cds/container/skip_list_map_rcu.h
index b8e96ec1..cc8b9919 100644
--- a/cds/container/skip_list_map_rcu.h
+++ b/cds/container/skip_list_map_rcu.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_SKIP_LIST_MAP_RCU_H
 #define __CDS_CONTAINER_SKIP_LIST_MAP_RCU_H
 
-#include <cds/container/skip_list_base.h>
+#include <cds/container/details/skip_list_base.h>
 #include <cds/intrusive/skip_list_rcu.h>
 #include <cds/container/details/make_skip_list_map.h>
 #include <cds/details/functor_wrapper.h>
diff --git a/cds/container/skip_list_set_hp.h b/cds/container/skip_list_set_hp.h
index 4cd3cd0c..07b27084 100644
--- a/cds/container/skip_list_set_hp.h
+++ b/cds/container/skip_list_set_hp.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_SKIP_LIST_SET_HP_H
 #define __CDS_CONTAINER_SKIP_LIST_SET_HP_H
 
-#include <cds/container/skip_list_base.h>
+#include <cds/container/details/skip_list_base.h>
 #include <cds/intrusive/skip_list_hp.h>
 #include <cds/container/details/make_skip_list_set.h>
 #include <cds/container/skip_list_set_impl.h>
diff --git a/cds/container/skip_list_set_hrc.h b/cds/container/skip_list_set_hrc.h
index 4b40362d..8ef44a91 100644
--- a/cds/container/skip_list_set_hrc.h
+++ b/cds/container/skip_list_set_hrc.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_SKIP_LIST_SET_HRC_H
 #define __CDS_CONTAINER_SKIP_LIST_SET_HRC_H
 
-#include <cds/container/skip_list_base.h>
+#include <cds/container/details/skip_list_base.h>
 #include <cds/intrusive/skip_list_hrc.h>
 #include <cds/container/details/make_skip_list_set.h>
 #include <cds/container/skip_list_set_impl.h>
diff --git a/cds/container/skip_list_set_nogc.h b/cds/container/skip_list_set_nogc.h
index 1aaf6b98..ae83672b 100644
--- a/cds/container/skip_list_set_nogc.h
+++ b/cds/container/skip_list_set_nogc.h
@@ -4,7 +4,7 @@
 #define __CDS_CONTAINER_SKIP_LIST_SET_NOGC_H
 
 #include <cds/intrusive/skip_list_nogc.h>
-#include <cds/container/skip_list_base.h>
+#include <cds/container/details/skip_list_base.h>
 #include <cds/details/binary_functor_wrapper.h>
 #include <cds/gc/nogc.h>
 #include <cds/details/allocator.h>
diff --git a/cds/container/skip_list_set_ptb.h b/cds/container/skip_list_set_ptb.h
index 502bbcc8..f539e41c 100644
--- a/cds/container/skip_list_set_ptb.h
+++ b/cds/container/skip_list_set_ptb.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_SKIP_LIST_MAP_PTB_H
 #define __CDS_CONTAINER_SKIP_LIST_MAP_PTB_H
 
-#include <cds/container/skip_list_base.h>
+#include <cds/container/details/skip_list_base.h>
 #include <cds/intrusive/skip_list_ptb.h>
 #include <cds/container/details/make_skip_list_set.h>
 #include <cds/container/skip_list_set_impl.h>
diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index 3acd3fe5..48fcf3d4 100644
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -666,6 +666,7 @@
     <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\details\skip_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" />
@@ -685,7 +686,6 @@
     <ClInclude Include="..\..\..\cds\container\michael_map_rcu.h" />
     <ClInclude Include="..\..\..\cds\container\michael_set_rcu.h" />
     <ClInclude Include="..\..\..\cds\container\mspriority_queue.h" />
-    <ClInclude Include="..\..\..\cds\container\skip_list_base.h" />
     <ClInclude Include="..\..\..\cds\container\skip_list_map_hp.h" />
     <ClInclude Include="..\..\..\cds\container\skip_list_map_hrc.h" />
     <ClInclude Include="..\..\..\cds\container\skip_list_map_impl.h" />
diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index 821a2153..209f65a7 100644
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -932,9 +932,6 @@
     <ClInclude Include="..\..\..\cds\intrusive\skip_list_ptb.h">
       <Filter>Header Files\cds\intrusive</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\container\skip_list_base.h">
-      <Filter>Header Files\cds\container</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\container\skip_list_set_hp.h">
       <Filter>Header Files\cds\container</Filter>
     </ClInclude>
@@ -1283,5 +1280,8 @@
     <ClInclude Include="..\..\..\cds\container\details\michael_set_base.h">
       <Filter>Header Files\cds\container\details</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\cds\container\details\skip_list_base.h">
+      <Filter>Header Files\cds\container\details</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
2.34.1