From 2baca2816793fcbf95360eeb6afe8c6450085905 Mon Sep 17 00:00:00 2001
From: khizmax <khizmax@gmail.com>
Date: Fri, 14 Nov 2014 14:48:26 +0300
Subject: [PATCH] rearrange cds/gc content

---
 cds/gc/dhp.h                          |  4 +--
 cds/gc/{ptb/ptb.h => dhp/dhp.h}       |  0
 cds/gc/{ => dhp}/dhp_decl.h           |  2 +-
 cds/gc/{ => dhp}/dhp_impl.h           |  0
 cds/gc/gc_fwd.h                       | 18 ------------
 cds/gc/hp.h                           |  4 +--
 cds/gc/hp/{hzp.h => hp.h}             |  0
 cds/gc/{ => hp}/hp_decl.h             |  0
 cds/gc/{ => hp}/hp_impl.h             |  0
 cds/threading/details/_common.h       |  4 +--
 projects/Win/vc12/cds.vcxproj         | 13 ++++-----
 projects/Win/vc12/cds.vcxproj.filters | 41 +++++++++++++--------------
 src/ptb_gc.cpp                        |  2 +-
 13 files changed, 33 insertions(+), 55 deletions(-)
 rename cds/gc/{ptb/ptb.h => dhp/dhp.h} (100%)
 rename cds/gc/{ => dhp}/dhp_decl.h (99%)
 rename cds/gc/{ => dhp}/dhp_impl.h (100%)
 delete mode 100644 cds/gc/gc_fwd.h
 rename cds/gc/hp/{hzp.h => hp.h} (100%)
 rename cds/gc/{ => hp}/hp_decl.h (100%)
 rename cds/gc/{ => hp}/hp_impl.h (100%)

diff --git a/cds/gc/dhp.h b/cds/gc/dhp.h
index 819f49dc..6943a5f0 100644
--- a/cds/gc/dhp.h
+++ b/cds/gc/dhp.h
@@ -3,8 +3,8 @@
 #ifndef __CDS_GC_PTB_H
 #define __CDS_GC_PTB_H
 
-#include <cds/gc/dhp_decl.h>
-#include <cds/gc/dhp_impl.h>
+#include <cds/gc/dhp/dhp_decl.h>
+#include <cds/gc/dhp/dhp_impl.h>
 #include <cds/details/lib.h>
 
 #endif // #ifndef __CDS_GC_PTB_H
diff --git a/cds/gc/ptb/ptb.h b/cds/gc/dhp/dhp.h
similarity index 100%
rename from cds/gc/ptb/ptb.h
rename to cds/gc/dhp/dhp.h
diff --git a/cds/gc/dhp_decl.h b/cds/gc/dhp/dhp_decl.h
similarity index 99%
rename from cds/gc/dhp_decl.h
rename to cds/gc/dhp/dhp_decl.h
index 32499132..111b90bc 100644
--- a/cds/gc/dhp_decl.h
+++ b/cds/gc/dhp/dhp_decl.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_GC_PTB_DECL_H
 #define __CDS_GC_PTB_DECL_H
 
-#include <cds/gc/ptb/ptb.h>
+#include <cds/gc/dhp/dhp.h>
 #include <cds/details/marked_ptr.h>
 #include <cds/details/static_functor.h>
 
diff --git a/cds/gc/dhp_impl.h b/cds/gc/dhp/dhp_impl.h
similarity index 100%
rename from cds/gc/dhp_impl.h
rename to cds/gc/dhp/dhp_impl.h
diff --git a/cds/gc/gc_fwd.h b/cds/gc/gc_fwd.h
deleted file mode 100644
index 365569f3..00000000
--- a/cds/gc/gc_fwd.h
+++ /dev/null
@@ -1,18 +0,0 @@
-//$$CDS-header$$
-
-#ifndef __CDS_GC_FORWARD_H
-#define __CDS_GC_FORWARD_H
-
-#include <cds/details/defs.h>
-
-//@cond
-namespace cds { namespace gc {
-    class HP;
-    class PTB;
-
-    class nogc;
-}} // namespace cds::gc
-
-//@endcond
-
-#endif // #ifndef __CDS_GC_FORWARD_H
diff --git a/cds/gc/hp.h b/cds/gc/hp.h
index 2c87f006..54618eab 100644
--- a/cds/gc/hp.h
+++ b/cds/gc/hp.h
@@ -3,8 +3,8 @@
 #ifndef __CDS_GC_HP_H
 #define __CDS_GC_HP_H
 
-#include <cds/gc/hp_decl.h>
-#include <cds/gc/hp_impl.h>
+#include <cds/gc/hp/hp_decl.h>
+#include <cds/gc/hp/hp_impl.h>
 #include <cds/details/lib.h>
 
 #endif  // #ifndef __CDS_GC_HP_H
diff --git a/cds/gc/hp/hzp.h b/cds/gc/hp/hp.h
similarity index 100%
rename from cds/gc/hp/hzp.h
rename to cds/gc/hp/hp.h
diff --git a/cds/gc/hp_decl.h b/cds/gc/hp/hp_decl.h
similarity index 100%
rename from cds/gc/hp_decl.h
rename to cds/gc/hp/hp_decl.h
diff --git a/cds/gc/hp_impl.h b/cds/gc/hp/hp_impl.h
similarity index 100%
rename from cds/gc/hp_impl.h
rename to cds/gc/hp/hp_impl.h
diff --git a/cds/threading/details/_common.h b/cds/threading/details/_common.h
index b31823a4..86f63c54 100644
--- a/cds/threading/details/_common.h
+++ b/cds/threading/details/_common.h
@@ -3,8 +3,8 @@
 #ifndef __CDS_THREADING__COMMON_H
 #define __CDS_THREADING__COMMON_H
 
-#include <cds/gc/hp_decl.h>
-#include <cds/gc/dhp_decl.h>
+#include <cds/gc/hp/hp_decl.h>
+#include <cds/gc/dhp/dhp_decl.h>
 
 #include <cds/urcu/details/gp_decl.h>
 #include <cds/urcu/details/sh_decl.h>
diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index d242c1e1..cf1ef383 100644
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -735,18 +735,18 @@
     <ClInclude Include="..\..\..\cds\details\lib.h" />
     <ClInclude Include="..\..\..\cds\details\static_functor.h" />
     <ClInclude Include="..\..\..\cds\gc\dhp.h" />
-    <ClInclude Include="..\..\..\cds\gc\dhp_decl.h" />
-    <ClInclude Include="..\..\..\cds\gc\dhp_impl.h" />
-    <ClInclude Include="..\..\..\cds\gc\gc_fwd.h" />
+    <ClInclude Include="..\..\..\cds\gc\dhp\dhp.h" />
+    <ClInclude Include="..\..\..\cds\gc\dhp\dhp_decl.h" />
+    <ClInclude Include="..\..\..\cds\gc\dhp\dhp_impl.h" />
     <ClInclude Include="..\..\..\cds\gc\guarded_ptr.h" />
     <ClInclude Include="..\..\..\cds\gc\hp\details\hp_alloc.h" />
     <ClInclude Include="..\..\..\cds\gc\hp\details\hp_fwd.h" />
     <ClInclude Include="..\..\..\cds\gc\hp\details\hp_inline.h" />
     <ClInclude Include="..\..\..\cds\gc\hp\details\hp_retired.h" />
     <ClInclude Include="..\..\..\cds\gc\hp\details\hp_type.h" />
-    <ClInclude Include="..\..\..\cds\gc\hp\hzp.h" />
-    <ClInclude Include="..\..\..\cds\gc\hp_decl.h" />
-    <ClInclude Include="..\..\..\cds\gc\hp_impl.h" />
+    <ClInclude Include="..\..\..\cds\gc\hp\hp.h" />
+    <ClInclude Include="..\..\..\cds\gc\hp\hp_decl.h" />
+    <ClInclude Include="..\..\..\cds\gc\hp\hp_impl.h" />
     <ClInclude Include="..\..\..\cds\intrusive\basket_queue.h" />
     <ClInclude Include="..\..\..\cds\intrusive\cuckoo_set.h" />
     <ClInclude Include="..\..\..\cds\intrusive\details\base.h" />
@@ -837,7 +837,6 @@
     <ClInclude Include="..\..\..\cds\gc\default_gc.h" />
     <ClInclude Include="..\..\..\cds\gc\hp.h" />
     <ClInclude Include="..\..\..\cds\gc\nogc.h" />
-    <ClInclude Include="..\..\..\cds\gc\ptb\ptb.h" />
     <ClInclude Include="..\..\..\cds\gc\details\retired_ptr.h" />
     <ClInclude Include="..\..\..\cds\user_setup\allocator.h" />
     <ClInclude Include="..\..\..\cds\user_setup\cache_line.h" />
diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index 75906e30..bee42d54 100644
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -18,9 +18,6 @@
     <Filter Include="Header Files\cds\gc">
       <UniqueIdentifier>{a3c9928d-5261-4593-a8b9-728235f7056f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\cds\gc\ptb">
-      <UniqueIdentifier>{53d28ee4-5fe9-4fa1-a617-53d8b0628eac}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Header Files\cds\gc\details">
       <UniqueIdentifier>{d7c48c0e-cc45-4a1a-b8e9-aa5b50abd22a}</UniqueIdentifier>
     </Filter>
@@ -154,6 +151,9 @@
     <Filter Include="Header Files\cds\gc\hp">
       <UniqueIdentifier>{043c4eba-3bd4-4226-b214-e26f18b422a1}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\cds\gc\dhp">
+      <UniqueIdentifier>{9c0f5739-8d9d-46c2-bb91-90ca5beecc6d}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\dllmain.cpp">
@@ -248,9 +248,6 @@
     <ClInclude Include="..\..\..\cds\gc\nogc.h">
       <Filter>Header Files\cds\gc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\gc\ptb\ptb.h">
-      <Filter>Header Files\cds\gc\ptb</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\gc\details\retired_ptr.h">
       <Filter>Header Files\cds\gc\details</Filter>
     </ClInclude>
@@ -638,12 +635,6 @@
     <ClInclude Include="..\..\..\cds\container\details\make_michael_list.h">
       <Filter>Header Files\cds\container\details</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\gc\hp_decl.h">
-      <Filter>Header Files\cds\gc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\cds\gc\hp_impl.h">
-      <Filter>Header Files\cds\gc</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\compiler\cxx11_atomic.h">
       <Filter>Header Files\cds\compiler</Filter>
     </ClInclude>
@@ -926,9 +917,6 @@
     <ClInclude Include="..\..\..\cds\details\binary_functor_wrapper.h">
       <Filter>Header Files\cds\details</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\gc\gc_fwd.h">
-      <Filter>Header Files\cds\gc</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\urcu\details\sh.h">
       <Filter>Header Files\cds\urcu\details</Filter>
     </ClInclude>
@@ -1169,12 +1157,6 @@
     <ClInclude Include="..\..\..\cds\gc\dhp.h">
       <Filter>Header Files\cds\gc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\gc\dhp_decl.h">
-      <Filter>Header Files\cds\gc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\cds\gc\dhp_impl.h">
-      <Filter>Header Files\cds\gc</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\gc\hp\details\hp_alloc.h">
       <Filter>Header Files\cds\gc\hp</Filter>
     </ClInclude>
@@ -1190,7 +1172,22 @@
     <ClInclude Include="..\..\..\cds\gc\hp\details\hp_type.h">
       <Filter>Header Files\cds\gc\hp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\gc\hp\hzp.h">
+    <ClInclude Include="..\..\..\cds\gc\hp\hp.h">
+      <Filter>Header Files\cds\gc\hp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\cds\gc\dhp\dhp.h">
+      <Filter>Header Files\cds\gc\dhp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\cds\gc\dhp\dhp_decl.h">
+      <Filter>Header Files\cds\gc\dhp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\cds\gc\dhp\dhp_impl.h">
+      <Filter>Header Files\cds\gc\dhp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\cds\gc\hp\hp_decl.h">
+      <Filter>Header Files\cds\gc\hp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\cds\gc\hp\hp_impl.h">
       <Filter>Header Files\cds\gc\hp</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/src/ptb_gc.cpp b/src/ptb_gc.cpp
index 59a149c2..b17d0e61 100644
--- a/src/ptb_gc.cpp
+++ b/src/ptb_gc.cpp
@@ -5,7 +5,7 @@
 #include <algorithm>   // std::fill
 #include <functional>  // std::hash
 
-#include <cds/gc/ptb/ptb.h>
+#include <cds/gc/dhp/dhp.h>
 #include <cds/algo/int_algo.h>
 
 namespace cds { namespace gc { namespace ptb {
-- 
2.34.1