From bd75ca75fd01e1d37d315fd5d873b4c13b85f634 Mon Sep 17 00:00:00 2001
From: khizmax <libcds.dev@gmail.com>
Date: Sat, 27 Sep 2014 20:01:38 +0400
Subject: [PATCH] Move ellen_bintree_base.h from cds/container to
 cds/container/details

---
 cds/container/{ => details}/ellen_bintree_base.h | 6 +++---
 cds/container/ellen_bintree_map_impl.h           | 2 +-
 cds/container/ellen_bintree_map_rcu.h            | 2 +-
 cds/container/ellen_bintree_set_impl.h           | 2 +-
 cds/container/ellen_bintree_set_rcu.h            | 2 +-
 projects/Win/vc12/cds.vcxproj                    | 2 +-
 projects/Win/vc12/cds.vcxproj.filters            | 6 +++---
 tests/unit/ellen_bintree_update_desc_pool.h      | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)
 rename cds/container/{ => details}/ellen_bintree_base.h (98%)

diff --git a/cds/container/ellen_bintree_base.h b/cds/container/details/ellen_bintree_base.h
similarity index 98%
rename from cds/container/ellen_bintree_base.h
rename to cds/container/details/ellen_bintree_base.h
index c772ffb9..ca6d7908 100644
--- a/cds/container/ellen_bintree_base.h
+++ b/cds/container/details/ellen_bintree_base.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_CONTAINER_ELLEN_BINTREE_BASE_H
-#define __CDS_CONTAINER_ELLEN_BINTREE_BASE_H
+#ifndef __CDS_CONTAINER_DETAILS_ELLEN_BINTREE_BASE_H
+#define __CDS_CONTAINER_DETAILS_ELLEN_BINTREE_BASE_H
 
 #include <cds/intrusive/details/ellen_bintree_base.h>
 #include <cds/container/details/base.h>
@@ -367,4 +367,4 @@ namespace cds { namespace container {
 
 }} // namespace cds::container
 
-#endif // #ifndef __CDS_CONTAINER_ELLEN_BINTREE_BASE_H
+#endif // #ifndef __CDS_CONTAINER_DETAILS_ELLEN_BINTREE_BASE_H
diff --git a/cds/container/ellen_bintree_map_impl.h b/cds/container/ellen_bintree_map_impl.h
index 7f34946a..4da58147 100644
--- a/cds/container/ellen_bintree_map_impl.h
+++ b/cds/container/ellen_bintree_map_impl.h
@@ -4,7 +4,7 @@
 #define __CDS_CONTAINER_ELLEN_BINTREE_MAP_IMPL_H
 
 #include <type_traits>
-#include <cds/container/ellen_bintree_base.h>
+#include <cds/container/details/ellen_bintree_base.h>
 #include <cds/intrusive/impl/ellen_bintree.h>
 #include <cds/details/functor_wrapper.h>
 #include <cds/container/details/guarded_ptr_cast.h>
diff --git a/cds/container/ellen_bintree_map_rcu.h b/cds/container/ellen_bintree_map_rcu.h
index c61a01cb..3da55942 100644
--- a/cds/container/ellen_bintree_map_rcu.h
+++ b/cds/container/ellen_bintree_map_rcu.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_ELLEN_BINTREE_MAP_RCU_H
 #define __CDS_CONTAINER_ELLEN_BINTREE_MAP_RCU_H
 
-#include <cds/container/ellen_bintree_base.h>
+#include <cds/container/details/ellen_bintree_base.h>
 #include <cds/intrusive/ellen_bintree_rcu.h>
 #include <cds/details/functor_wrapper.h>
 
diff --git a/cds/container/ellen_bintree_set_impl.h b/cds/container/ellen_bintree_set_impl.h
index 43e5ae61..b51dd927 100644
--- a/cds/container/ellen_bintree_set_impl.h
+++ b/cds/container/ellen_bintree_set_impl.h
@@ -4,7 +4,7 @@
 #define __CDS_CONTAINER_ELLEN_BINTREE_SET_IMPL_H
 
 #include <type_traits>
-#include <cds/container/ellen_bintree_base.h>
+#include <cds/container/details/ellen_bintree_base.h>
 #include <cds/intrusive/impl/ellen_bintree.h>
 #include <cds/container/details/guarded_ptr_cast.h>
 
diff --git a/cds/container/ellen_bintree_set_rcu.h b/cds/container/ellen_bintree_set_rcu.h
index 949f5c09..96788e52 100644
--- a/cds/container/ellen_bintree_set_rcu.h
+++ b/cds/container/ellen_bintree_set_rcu.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_ELLEN_BINTREE_SET_RCU_H
 #define __CDS_CONTAINER_ELLEN_BINTREE_SET_RCU_H
 
-#include <cds/container/ellen_bintree_base.h>
+#include <cds/container/details/ellen_bintree_base.h>
 #include <cds/intrusive/ellen_bintree_rcu.h>
 
 namespace cds { namespace container {
diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index ce60f743..8ff0c9ca 100644
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -657,11 +657,11 @@
     <ClInclude Include="..\..\..\cds\container\cuckoo_set.h" />
     <ClInclude Include="..\..\..\cds\container\details\base.h" />
     <ClInclude Include="..\..\..\cds\container\details\cuckoo_base.h" />
+    <ClInclude Include="..\..\..\cds\container\details\ellen_bintree_base.h" />
     <ClInclude Include="..\..\..\cds\container\details\guarded_ptr_cast.h" />
     <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\ellen_bintree_base.h" />
     <ClInclude Include="..\..\..\cds\container\ellen_bintree_map_hp.h" />
     <ClInclude Include="..\..\..\cds\container\ellen_bintree_map_impl.h" />
     <ClInclude Include="..\..\..\cds\container\ellen_bintree_map_ptb.h" />
diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index be401fc2..54443a7f 100644
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -1130,9 +1130,6 @@
     <ClInclude Include="..\..\..\cds\intrusive\ellen_bintree_rcu.h">
       <Filter>Header Files\cds\intrusive</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\container\ellen_bintree_base.h">
-      <Filter>Header Files\cds\container</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\container\ellen_bintree_set_rcu.h">
       <Filter>Header Files\cds\container</Filter>
     </ClInclude>
@@ -1280,5 +1277,8 @@
     <ClInclude Include="..\..\..\cds\container\details\cuckoo_base.h">
       <Filter>Header Files\cds\container\details</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\cds\container\details\ellen_bintree_base.h">
+      <Filter>Header Files\cds\container\details</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/unit/ellen_bintree_update_desc_pool.h b/tests/unit/ellen_bintree_update_desc_pool.h
index ccb37f23..0887b2f9 100644
--- a/tests/unit/ellen_bintree_update_desc_pool.h
+++ b/tests/unit/ellen_bintree_update_desc_pool.h
@@ -4,7 +4,7 @@
 #define __CDS_UNIT_ELLEN_BINTREE_UPDATE_DESC_POOL_H
 
 #include <cds/urcu/general_instant.h>
-#include <cds/container/ellen_bintree_base.h>
+#include <cds/container/details/ellen_bintree_base.h>
 #include <cds/memory/vyukov_queue_pool.h>
 #include <cds/memory/pool_allocator.h>
 
-- 
2.34.1