From bf07e8e6d13a34ae4185215586826e76f0b1e92b Mon Sep 17 00:00:00 2001
From: khizmax <libcds.dev@gmail.com>
Date: Sat, 27 Sep 2014 18:35:06 +0400
Subject: [PATCH] Rename cds/intrusive/ellen_bintree_impl.h to
 cds/intrusive/impl/ellen_bintree.h

---
 cds/container/ellen_bintree_map_impl.h                   | 2 +-
 cds/container/ellen_bintree_set_impl.h                   | 2 +-
 cds/intrusive/ellen_bintree_hp.h                         | 2 +-
 cds/intrusive/ellen_bintree_ptb.h                        | 2 +-
 .../{ellen_bintree_impl.h => impl/ellen_bintree.h}       | 8 ++++----
 projects/Win/vc12/cds.vcxproj                            | 2 +-
 projects/Win/vc12/cds.vcxproj.filters                    | 9 ++++++---
 7 files changed, 15 insertions(+), 12 deletions(-)
 rename cds/intrusive/{ellen_bintree_impl.h => impl/ellen_bintree.h} (99%)

diff --git a/cds/container/ellen_bintree_map_impl.h b/cds/container/ellen_bintree_map_impl.h
index 8fe59da1..7f34946a 100644
--- a/cds/container/ellen_bintree_map_impl.h
+++ b/cds/container/ellen_bintree_map_impl.h
@@ -5,7 +5,7 @@
 
 #include <type_traits>
 #include <cds/container/ellen_bintree_base.h>
-#include <cds/intrusive/ellen_bintree_impl.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_set_impl.h b/cds/container/ellen_bintree_set_impl.h
index 739d3a0b..43e5ae61 100644
--- a/cds/container/ellen_bintree_set_impl.h
+++ b/cds/container/ellen_bintree_set_impl.h
@@ -5,7 +5,7 @@
 
 #include <type_traits>
 #include <cds/container/ellen_bintree_base.h>
-#include <cds/intrusive/ellen_bintree_impl.h>
+#include <cds/intrusive/impl/ellen_bintree.h>
 #include <cds/container/details/guarded_ptr_cast.h>
 
 namespace cds { namespace container {
diff --git a/cds/intrusive/ellen_bintree_hp.h b/cds/intrusive/ellen_bintree_hp.h
index 02e52ccd..535c582a 100644
--- a/cds/intrusive/ellen_bintree_hp.h
+++ b/cds/intrusive/ellen_bintree_hp.h
@@ -4,6 +4,6 @@
 #define __CDS_INTRUSIVE_ELLEN_BINTREE_HP_H
 
 #include <cds/gc/hp.h>
-#include <cds/intrusive/ellen_bintree_impl.h>
+#include <cds/intrusive/impl/ellen_bintree.h>
 
 #endif  // #ifndef __CDS_INTRUSIVE_ELLEN_BINTREE_HP_H
diff --git a/cds/intrusive/ellen_bintree_ptb.h b/cds/intrusive/ellen_bintree_ptb.h
index 3ed45f24..88f7393d 100644
--- a/cds/intrusive/ellen_bintree_ptb.h
+++ b/cds/intrusive/ellen_bintree_ptb.h
@@ -4,6 +4,6 @@
 #define __CDS_INTRUSIVE_ELLEN_BINTREE_PTB_H
 
 #include <cds/gc/ptb.h>
-#include <cds/intrusive/ellen_bintree_impl.h>
+#include <cds/intrusive/impl/ellen_bintree.h>
 
 #endif  // #ifndef __CDS_INTRUSIVE_ELLEN_BINTREE_PTB_H
diff --git a/cds/intrusive/ellen_bintree_impl.h b/cds/intrusive/impl/ellen_bintree.h
similarity index 99%
rename from cds/intrusive/ellen_bintree_impl.h
rename to cds/intrusive/impl/ellen_bintree.h
index 63f0cc4c..039114ff 100644
--- a/cds/intrusive/ellen_bintree_impl.h
+++ b/cds/intrusive/impl/ellen_bintree.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_INTRUSIVE_ELLEN_BINTREE_IMPL_H
-#define __CDS_INTRUSIVE_ELLEN_BINTREE_IMPL_H
+#ifndef __CDS_INTRUSIVE_IMPL_ELLEN_BINTREE_H
+#define __CDS_INTRUSIVE_IMPL_ELLEN_BINTREE_H
 
 #include <memory>
 #include <cds/intrusive/details/ellen_bintree_base.h>
@@ -42,7 +42,7 @@ namespace cds { namespace intrusive {
         @warning Recall the tree is <b>unbalanced</b>. The complexity of operations is <tt>O(log N)</tt>
         for uniformly distributed random keys, but in worst case the complexity is <tt>O(N)</tt>.
 
-        @note Do not include <tt><cds/intrusive/ellen_bintree_impl.h></tt> header file explicitly.
+        @note Do not include <tt><cds/intrusive/impl/ellen_bintree.h></tt> header file explicitly.
         There are header file for each GC type:
         - <tt><cds/intrusive/ellen_bintree_hp.h></tt> - for Hazard Pointer GC cds::gc::HP
         - <tt><cds/intrusive/ellen_bintree_ptb.h></tt> - for Pass-the-Buck GC cds::gc::PTB
@@ -1544,4 +1544,4 @@ namespace cds { namespace intrusive {
 
 }} // namespace cds::intrusive
 
-#endif // #ifndef __CDS_INTRUSIVE_ELLEN_BINTREE_IMPL_H
+#endif // #ifndef __CDS_INTRUSIVE_IMPL_ELLEN_BINTREE_H
diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index bcd93d76..6ecb6a4e 100644
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -741,9 +741,9 @@
     <ClInclude Include="..\..\..\cds\intrusive\details\ellen_bintree_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_impl.h" />
     <ClInclude Include="..\..\..\cds\intrusive\ellen_bintree_ptb.h" />
     <ClInclude Include="..\..\..\cds\intrusive\ellen_bintree_rcu.h" />
+    <ClInclude Include="..\..\..\cds\intrusive\impl\ellen_bintree.h" />
     <ClInclude Include="..\..\..\cds\intrusive\lazy_list_rcu.h" />
     <ClInclude Include="..\..\..\cds\intrusive\michael_list_rcu.h" />
     <ClInclude Include="..\..\..\cds\intrusive\michael_set_rcu.h" />
diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index ebbbe23d..16cc0670 100644
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -151,6 +151,9 @@
     <Filter Include="Header Files\cds\algo">
       <UniqueIdentifier>{a85484ff-a066-4ee3-a856-b724b72dd7ff}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\cds\intrusive\impl">
+      <UniqueIdentifier>{00a14aa8-3035-4b56-bc86-442ca9bf8f44}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\dllmain.cpp">
@@ -1193,9 +1196,6 @@
     <ClInclude Include="..\..\..\cds\details\lib.h">
       <Filter>Header Files\cds\details</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\intrusive\ellen_bintree_impl.h">
-      <Filter>Header Files\cds\intrusive</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\container\ellen_bintree_map_hp.h">
       <Filter>Header Files\cds\container</Filter>
     </ClInclude>
@@ -1277,5 +1277,8 @@
     <ClInclude Include="..\..\..\cds\intrusive\details\base.h">
       <Filter>Header Files\cds\intrusive\details</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\cds\intrusive\impl\ellen_bintree.h">
+      <Filter>Header Files\cds\intrusive\impl</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
2.34.1