From: khizmax <khizmax@gmail.com>
Date: Fri, 14 Nov 2014 12:04:00 +0000 (+0300)
Subject: rearrange cds/gc content
X-Git-Tag: v2.0.0~94
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=commitdiff_plain;h=cc85be90a5a236fdec17307656ef6bbdba040def

rearrange cds/gc content
---

diff --git a/cds/gc/dhp.h b/cds/gc/dhp.h
index 6943a5f0..fe3ff4b6 100644
--- 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 aa943932..3ae518c3 100644
--- 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 111b90bc..71b6b3e3 100644
--- 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 201564cf..2d88afad 100644
--- 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 2dcadd25..637d0344 100644
--- 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 3183f47f..4cd723c5 100644
--- 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 dbb561c4..ec0bf103 100644
--- 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 6b6dd4a2..740e141d 100644
--- 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 7ff9ab35..2188a2a3 100644
--- 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 7e291659..6300178d 100644
--- 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 76f0aba2..cc846ecd 100644
--- 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 d2006e37..b78e1607 100644
--- 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