rearrange cds/gc content

diff --git a/cds/gc/dhp.h b/cds/gc/dhp.h
index 6943a5f044f1455859f514e738b3df4b7d60d1a7..fe3ff4b61d8a43b9e5d0493e756ec13baaca970f 100644 (file)
--- a/cds/gc/dhp.h
+++ b/cds/gc/dhp.h
@@ -1,10 +1,14 @@
 //$$CDS-header$$
 
-#ifndef __CDS_GC_PTB_H
-#define __CDS_GC_PTB_H
+#ifndef __CDS_GC_DHP_H
+#define __CDS_GC_DHP_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
+namespace cds { namespace gc {
+    typedef PTB DHP;
+}} // namespace cds::gc
+
+#endif // #ifndef __CDS_GC_DHP_H

diff --git a/cds/gc/dhp/dhp.h b/cds/gc/dhp/dhp.h
index aa943932cc0eafaab71ee5f686a4deabbe88c020..3ae518c314e5d72acd05bef4272496881b5ca501 100644 (file)
--- a/cds/gc/dhp/dhp.h
+++ b/cds/gc/dhp/dhp.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_GC_PTB_PASS_THE_BUCK_H
-#define __CDS_GC_PTB_PASS_THE_BUCK_H
+#ifndef __CDS_GC_DHP_DHP_H
+#define __CDS_GC_DHP_DHP_H
 
 #include <mutex>        // unique_lock
 #include <cds/cxx11_atomic.h>
@@ -1051,4 +1051,4 @@ namespace cds { namespace gc {
 #endif
 
 
-#endif // #ifndef __CDS_GC_PTB_PASS_THE_BUCK_H
+#endif // #ifndef __CDS_GC_DHP_DHP_H

diff --git a/cds/gc/dhp/dhp_decl.h b/cds/gc/dhp/dhp_decl.h
index 111b90bc2de732cf59477d917d2eb4cf756ffa01..71b6b3e3da148950cac3af9312769268c1f7234f 100644 (file)
--- a/cds/gc/dhp/dhp_decl.h
+++ b/cds/gc/dhp/dhp_decl.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_GC_PTB_DECL_H
-#define __CDS_GC_PTB_DECL_H
+#ifndef __CDS_GC_DHP_DHP_DECL_H
+#define __CDS_GC_DHP_DHP_DECL_H
 
 #include <cds/gc/dhp/dhp.h>
 #include <cds/details/marked_ptr.h>
@@ -418,4 +418,4 @@ namespace cds { namespace gc {
 
 }} // namespace cds::gc
 
-#endif // #ifndef __CDS_GC_PTB_DECL_H
+#endif // #ifndef __CDS_GC_DHP_DHP_DECL_H

diff --git a/cds/gc/dhp/dhp_impl.h b/cds/gc/dhp/dhp_impl.h
index 201564cf9c2a9dce68fa0396d19e5a8b86e6ac47..2d88afad2f32be12d9bbffc0b2bcbc0b4f55bf4a 100644 (file)
--- a/cds/gc/dhp/dhp_impl.h
+++ b/cds/gc/dhp/dhp_impl.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_GC_PTB_IMPL_H
-#define __CDS_GC_PTB_IMPL_H
+#ifndef __CDS_GC_DHP_DHP_IMPL_H
+#define __CDS_GC_DHP_DHP_IMPL_H
 
 #include <cds/threading/model.h>
 
@@ -40,4 +40,4 @@ namespace cds { namespace gc {
 }} // namespace cds::gc
 //@endcond
 
-#endif // #ifndef __CDS_GC_PTB_IMPL_H
+#endif // #ifndef __CDS_GC_DHP_DHP_IMPL_H

diff --git a/cds/gc/hp/details/hp_alloc.h b/cds/gc/hp/details/hp_alloc.h
index 2dcadd25e247cc09f432cb501c1d184b914b99ec..637d03440663ee247afd3e025b15ec3b44a389af 100644 (file)
--- a/cds/gc/hp/details/hp_alloc.h
+++ b/cds/gc/hp/details/hp_alloc.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_GC_HZP_DETAILS_HP_ALLOC_H
-#define __CDS_GC_HZP_DETAILS_HP_ALLOC_H
+#ifndef __CDS_GC_HP_DETAILS_HP_ALLOC_H
+#define __CDS_GC_HP_DETAILS_HP_ALLOC_H
 
 #include <cds/cxx11_atomic.h>
 #include <cds/details/allocator.h>
@@ -321,4 +321,4 @@ namespace cds {
 }   // namespace cds
 //@endcond
 
-#endif // #ifndef __CDS_GC_HZP_DETAILS_HP_ALLOC_H
+#endif // #ifndef __CDS_GC_HP_DETAILS_HP_ALLOC_H

diff --git a/cds/gc/hp/details/hp_fwd.h b/cds/gc/hp/details/hp_fwd.h
index 3183f47f36488fcc15652e7dd37a80985043b3e9..4cd723c552231ed66a56b3e8beb55248cc6b1d23 100644 (file)
--- a/cds/gc/hp/details/hp_fwd.h
+++ b/cds/gc/hp/details/hp_fwd.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_GC_HZP_DETAILS_HP_FWD_H
-#define __CDS_GC_HZP_DETAILS_HP_FWD_H
+#ifndef __CDS_GC_HP_DETAILS_HP_FWD_H
+#define __CDS_GC_HP_DETAILS_HP_FWD_H
 
 namespace cds {
     namespace gc { namespace hzp {
@@ -12,4 +12,4 @@ namespace cds {
     } }
 }
 
-#endif // #ifndef __CDS_GC_HZP_DETAILS_HP_FWD_H
+#endif // #ifndef __CDS_GC_HP_DETAILS_HP_FWD_H

diff --git a/cds/gc/hp/details/hp_inline.h b/cds/gc/hp/details/hp_inline.h
index dbb561c46bd7e62070016a8a8d07508aafad1245..ec0bf1032d25c5ccd67b9de9d7db3cb3d9e8d0cf 100644 (file)
--- a/cds/gc/hp/details/hp_inline.h
+++ b/cds/gc/hp/details/hp_inline.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_GC_HZP_DETAILS_HP_INLINE_H
-#define __CDS_GC_HZP_DETAILS_HP_INLINE_H
+#ifndef __CDS_GC_HP_DETAILS_HP_INLINE_H
+#define __CDS_GC_HP_DETAILS_HP_INLINE_H
 
 namespace cds {
     namespace gc{ namespace hzp { namespace details {
@@ -23,4 +23,4 @@ namespace cds {
 }    // namespace cds
 
 
-#endif // #ifndef __CDS_GC_HZP_DETAILS_HP_INLINE_H
+#endif // #ifndef __CDS_GC_HP_DETAILS_HP_INLINE_H

diff --git a/cds/gc/hp/details/hp_retired.h b/cds/gc/hp/details/hp_retired.h
index 6b6dd4a20743e37bb80c495b10b2a12d6c5e6a01..740e141d37e3b2594d30b3863436e360e6b090e8 100644 (file)
--- a/cds/gc/hp/details/hp_retired.h
+++ b/cds/gc/hp/details/hp_retired.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_GC_HZP_DETAILS_HP_RETIRED_H
-#define __CDS_GC_HZP_DETAILS_HP_RETIRED_H
+#ifndef __CDS_GC_HP_DETAILS_HP_RETIRED_H
+#define __CDS_GC_HP_DETAILS_HP_RETIRED_H
 
 #include <cds/gc/hp/details/hp_fwd.h>
 #include <cds/gc/hp/details/hp_type.h>
@@ -83,4 +83,4 @@ namespace cds {
     } } }    // namespace gc::hzp::details
 }    // namespace cds
 
-#endif // #ifndef __CDS_GC_HZP_DETAILS_HP_RETIRED_H
+#endif // #ifndef __CDS_GC_HP_DETAILS_HP_RETIRED_H

diff --git a/cds/gc/hp/details/hp_type.h b/cds/gc/hp/details/hp_type.h
index 7ff9ab3516bef66d822b07b16fe3e6011ffb9fe0..2188a2a33b41d6c60cfab16a8dc118c9f783eba8 100644 (file)
--- a/cds/gc/hp/details/hp_type.h
+++ b/cds/gc/hp/details/hp_type.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_GC_HZP_DETAILS_HP_TYPE_H
-#define __CDS_GC_HZP_DETAILS_HP_TYPE_H
+#ifndef __CDS_GC_HP_DETAILS_HP_TYPE_H
+#define __CDS_GC_HP_DETAILS_HP_TYPE_H
 
 #include <cds/gc/details/retired_ptr.h>
 
@@ -18,6 +18,6 @@ namespace cds {
     }
 }
 
-#endif // #ifndef __CDS_GC_HZP_DETAILS_HP_TYPE_H
+#endif // #ifndef __CDS_GC_HP_DETAILS_HP_TYPE_H
 
 

diff --git a/cds/gc/hp/hp.h b/cds/gc/hp/hp.h
index 7e291659c859a0f3e861c85a4ae91c53b17055cd..6300178d7046722abcab740d952e1f164a2e3533 100644 (file)
--- a/cds/gc/hp/hp.h
+++ b/cds/gc/hp/hp.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_GC_HZP_HZP_H
-#define __CDS_GC_HZP_HZP_H
+#ifndef __CDS_GC_HP_HP_H
+#define __CDS_GC_HP_HP_H
 
 #include <vector>
 #include <cds/cxx11_atomic.h>
@@ -652,4 +652,4 @@ namespace cds {
 #   pragma warning(pop)
 #endif
 
-#endif  // #ifndef __CDS_GC_HZP_HZP_H
+#endif  // #ifndef __CDS_GC_HP_HP_H

diff --git a/cds/gc/hp/hp_decl.h b/cds/gc/hp/hp_decl.h
index 76f0aba2d2fa1efe0bcfe00a271336d3ba140a6b..cc846ecdba617691cc2a44d414e7668f86d85e04 100644 (file)
--- a/cds/gc/hp/hp_decl.h
+++ b/cds/gc/hp/hp_decl.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_GC_HP_DECL_H
-#define __CDS_GC_HP_DECL_H
+#ifndef __CDS_GC_HP_HP_DECL_H
+#define __CDS_GC_HP_HP_DECL_H
 
 #include <stdexcept>    // overflow_error
 #include <cds/gc/hp/hp.h>
@@ -501,4 +501,4 @@ namespace cds { namespace gc {
     };
 }}  // namespace cds::gc
 
-#endif  // #ifndef __CDS_GC_HP_DECL_H
+#endif  // #ifndef __CDS_GC_HP_HP_DECL_H

diff --git a/cds/gc/hp/hp_impl.h b/cds/gc/hp/hp_impl.h
index d2006e374d4758ba815a7ef8f5ed0528b05c52c1..b78e16070be7415193a7717b4432e560ef29c079 100644 (file)
--- a/cds/gc/hp/hp_impl.h
+++ b/cds/gc/hp/hp_impl.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_GC_HP_IMPL_H
-#define __CDS_GC_HP_IMPL_H
+#ifndef __CDS_GC_HP_HP_IMPL_H
+#define __CDS_GC_HP_HP_IMPL_H
 
 #include <cds/threading/model.h>
 #include <cds/details/static_functor.h>
@@ -54,4 +54,4 @@ namespace cds { namespace gc {
 }} // namespace cds::gc
 //@endcond
 
-#endif // #ifndef __CDS_GC_HP_IMPL_H
+#endif // #ifndef __CDS_GC_HP_HP_IMPL_H