From 5d36d21f32844cfa33232acece715e9d1b627696 Mon Sep 17 00:00:00 2001
From: khizmax <libcds.dev@gmail.com>
Date: Wed, 22 Oct 2014 09:26:27 +0400
Subject: [PATCH] rename michael_list_ptb.h to michael_list_dhp.h

---
 cds/container/impl/michael_list.h                    |  2 +-
 cds/container/michael_kvlist_ptb.h                   |  2 +-
 cds/container/michael_list_dhp.h                     | 11 +++++++++++
 cds/container/michael_list_ptb.h                     | 11 -----------
 cds/container/michael_set.h                          |  2 +-
 cds/intrusive/impl/michael_list.h                    |  6 +++---
 cds/intrusive/michael_list_dhp.h                     |  9 +++++++++
 cds/intrusive/michael_list_ptb.h                     |  9 ---------
 cds/intrusive/michael_set.h                          |  2 +-
 projects/Win/vc12/cds.vcxproj                        |  4 ++--
 projects/Win/vc12/cds.vcxproj.filters                | 12 ++++++------
 tests/test-hdr/map/hdr_splitlist_map_ptb.cpp         |  2 +-
 .../ordered_list/hdr_intrusive_michael_ptb.cpp       |  2 +-
 tests/test-hdr/ordered_list/hdr_michael_ptb.cpp      |  2 +-
 tests/test-hdr/set/hdr_intrusive_michael_set_ptb.cpp |  2 +-
 .../test-hdr/set/hdr_intrusive_splitlist_set_ptb.cpp |  2 +-
 tests/test-hdr/set/hdr_michael_set_ptb.cpp           |  2 +-
 tests/test-hdr/set/hdr_splitlist_set_ptb.cpp         |  2 +-
 tests/unit/set2/set_types.h                          |  2 +-
 19 files changed, 43 insertions(+), 43 deletions(-)
 create mode 100644 cds/container/michael_list_dhp.h
 delete mode 100644 cds/container/michael_list_ptb.h
 create mode 100644 cds/intrusive/michael_list_dhp.h
 delete mode 100644 cds/intrusive/michael_list_ptb.h

diff --git a/cds/container/impl/michael_list.h b/cds/container/impl/michael_list.h
index 7ef71ec7..1ea66117 100644
--- a/cds/container/impl/michael_list.h
+++ b/cds/container/impl/michael_list.h
@@ -82,7 +82,7 @@ namespace cds { namespace container {
         There are different specializations of this template for each garbage collecting schema used.
         You should include appropriate .h-file depending on GC you are using:
         - for gc::HP: \code #include <cds/container/michael_list_hp.h> \endcode
-        - for gc::PTB: \code #include <cds/container/michael_list_ptb.h> \endcode
+        - for gc::DHP: \code #include <cds/container/michael_list_dhp.h> \endcode
         - for \ref cds_urcu_desc "RCU": \code #include <cds/container/michael_list_rcu.h> \endcode
         - for gc::nogc: \code #include <cds/container/michael_list_nogc.h> \endcode
     */
diff --git a/cds/container/michael_kvlist_ptb.h b/cds/container/michael_kvlist_ptb.h
index 0090dc5c..aef357f9 100644
--- a/cds/container/michael_kvlist_ptb.h
+++ b/cds/container/michael_kvlist_ptb.h
@@ -4,7 +4,7 @@
 #define __CDS_CONTAINER_MICHAEL_KVLIST_PTB_H
 
 #include <cds/container/details/michael_list_base.h>
-#include <cds/intrusive/michael_list_ptb.h>
+#include <cds/intrusive/michael_list_dhp.h>
 #include <cds/container/details/make_michael_kvlist.h>
 #include <cds/container/impl/michael_kvlist.h>
 
diff --git a/cds/container/michael_list_dhp.h b/cds/container/michael_list_dhp.h
new file mode 100644
index 00000000..d89e4df0
--- /dev/null
+++ b/cds/container/michael_list_dhp.h
@@ -0,0 +1,11 @@
+//$$CDS-header$$
+
+#ifndef __CDS_CONTAINER_MICHAEL_LIST_DHP_H
+#define __CDS_CONTAINER_MICHAEL_LIST_DHP_H
+
+#include <cds/container/details/michael_list_base.h>
+#include <cds/intrusive/michael_list_dhp.h>
+#include <cds/container/details/make_michael_list.h>
+#include <cds/container/impl/michael_list.h>
+
+#endif // #ifndef __CDS_CONTAINER_MICHAEL_LIST_DHP_H
diff --git a/cds/container/michael_list_ptb.h b/cds/container/michael_list_ptb.h
deleted file mode 100644
index c63ec6ba..00000000
--- a/cds/container/michael_list_ptb.h
+++ /dev/null
@@ -1,11 +0,0 @@
-//$$CDS-header$$
-
-#ifndef __CDS_CONTAINER_MICHAEL_LIST_PTB_H
-#define __CDS_CONTAINER_MICHAEL_LIST_PTB_H
-
-#include <cds/container/details/michael_list_base.h>
-#include <cds/intrusive/michael_list_ptb.h>
-#include <cds/container/details/make_michael_list.h>
-#include <cds/container/impl/michael_list.h>
-
-#endif // #ifndef __CDS_CONTAINER_MICHAEL_LIST_PTB_H
diff --git a/cds/container/michael_set.h b/cds/container/michael_set.h
index 49627a99..acc62719 100644
--- a/cds/container/michael_set.h
+++ b/cds/container/michael_set.h
@@ -127,7 +127,7 @@ namespace cds { namespace container {
         MichaelList as a bucket type. Also, for ordered list we should develop a comparator for our \p Foo
         struct.
         \code
-        #include <cds/container/michael_list_ptb.h>
+        #include <cds/container/michael_list_dhp.h>
         #include <cds/container/michael_set.h>
 
         namespace cc = cds::container;
diff --git a/cds/intrusive/impl/michael_list.h b/cds/intrusive/impl/michael_list.h
index 43addd16..20d52466 100644
--- a/cds/intrusive/impl/michael_list.h
+++ b/cds/intrusive/impl/michael_list.h
@@ -89,7 +89,7 @@ namespace cds { namespace intrusive {
         There are different specializations of this template for each garbage collecting schema used.
         You should select GC needed and include appropriate .h-file:
         - for gc::HP: \code #include <cds/intrusive/michael_list_hp.h> \endcode
-        - for gc::PTB: \code #include <cds/intrusive/michael_list_ptb.h> \endcode
+        - for gc::DHP: \code #include <cds/intrusive/michael_list_dhp.h> \endcode
         - for gc::HRC: \code #include <cds/intrusive/michael_list_hrc.h> \endcode
         - for \ref cds_urcu_gc "RCU type" - see \ref cds_intrusive_MichaelList_rcu "RCU-based MichaelList"
         - for gc::nogc: \code #include <cds/intrusive/michael_list_nogc.h> \endcode
@@ -102,7 +102,7 @@ namespace cds { namespace intrusive {
         Example for gc::PTB and base hook:
         \code
         // Include GC-related Michael's list specialization
-        #include <cds/intrusive/michael_list_ptb.h>
+        #include <cds/intrusive/michael_list_dhp.h>
 
         // Data stored in Michael's list
         struct my_data: public cds::intrusive::michael_list::node< cds::gc::PTB >
@@ -147,7 +147,7 @@ namespace cds { namespace intrusive {
         Equivalent option-based code:
         \code
         // GC-related specialization
-        #include <cds/intrusive/michael_list_ptb.h>
+        #include <cds/intrusive/michael_list_dhp.h>
 
         struct my_data {
             // see above
diff --git a/cds/intrusive/michael_list_dhp.h b/cds/intrusive/michael_list_dhp.h
new file mode 100644
index 00000000..b331260b
--- /dev/null
+++ b/cds/intrusive/michael_list_dhp.h
@@ -0,0 +1,9 @@
+//$$CDS-header$$
+
+#ifndef __CDS_INTRUSIVE_MICHAEL_LIST_DHP_H
+#define __CDS_INTRUSIVE_MICHAEL_LIST_DHP_H
+
+#include <cds/intrusive/impl/michael_list.h>
+#include <cds/gc/dhp.h>
+
+#endif // #ifndef __CDS_INTRUSIVE_MICHAEL_LIST_DHP_H
diff --git a/cds/intrusive/michael_list_ptb.h b/cds/intrusive/michael_list_ptb.h
deleted file mode 100644
index a338e9e9..00000000
--- a/cds/intrusive/michael_list_ptb.h
+++ /dev/null
@@ -1,9 +0,0 @@
-//$$CDS-header$$
-
-#ifndef __CDS_INTRUSIVE_MICHAEL_LIST_PTB_H
-#define __CDS_INTRUSIVE_MICHAEL_LIST_PTB_H
-
-#include <cds/intrusive/impl/michael_list.h>
-#include <cds/gc/ptb.h>
-
-#endif // #ifndef __CDS_INTRUSIVE_MICHAEL_LIST_PTB_H
diff --git a/cds/intrusive/michael_set.h b/cds/intrusive/michael_set.h
index 51ebeeb9..be8cf1d0 100644
--- a/cds/intrusive/michael_set.h
+++ b/cds/intrusive/michael_set.h
@@ -132,7 +132,7 @@ namespace cds { namespace intrusive {
         Like other intrusive containers, you may build several containers on single item structure:
         \code
         #include <cds/intrusive/michael_list_hp.h>
-        #include <cds/intrusive/michael_list_ptb.h>
+        #include <cds/intrusive/michael_list_dhp.h>
         #include <cds/intrusive/michael_set.h>
 
         struct tag_key1_idx;
diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index a00b5821..4df3bea0 100644
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -685,6 +685,7 @@
     <ClInclude Include="..\..\..\cds\container\lazy_kvlist_rcu.h" />
     <ClInclude Include="..\..\..\cds\container\lazy_list_rcu.h" />
     <ClInclude Include="..\..\..\cds\container\michael_kvlist_rcu.h" />
+    <ClInclude Include="..\..\..\cds\container\michael_list_dhp.h" />
     <ClInclude Include="..\..\..\cds\container\michael_list_rcu.h" />
     <ClInclude Include="..\..\..\cds\container\michael_map_rcu.h" />
     <ClInclude Include="..\..\..\cds\container\michael_set_rcu.h" />
@@ -763,6 +764,7 @@
     <ClInclude Include="..\..\..\cds\intrusive\impl\michael_list.h" />
     <ClInclude Include="..\..\..\cds\intrusive\impl\skip_list.h" />
     <ClInclude Include="..\..\..\cds\intrusive\lazy_list_rcu.h" />
+    <ClInclude Include="..\..\..\cds\intrusive\michael_list_dhp.h" />
     <ClInclude Include="..\..\..\cds\intrusive\michael_list_rcu.h" />
     <ClInclude Include="..\..\..\cds\intrusive\michael_set_rcu.h" />
     <ClInclude Include="..\..\..\cds\intrusive\mspriority_queue.h" />
@@ -935,7 +937,6 @@
     <ClInclude Include="..\..\..\cds\intrusive\michael_list_hp.h" />
     <ClInclude Include="..\..\..\cds\intrusive\michael_list_hrc.h" />
     <ClInclude Include="..\..\..\cds\intrusive\michael_list_nogc.h" />
-    <ClInclude Include="..\..\..\cds\intrusive\michael_list_ptb.h" />
     <ClInclude Include="..\..\..\cds\intrusive\michael_set.h" />
     <ClInclude Include="..\..\..\cds\intrusive\michael_set_nogc.h" />
     <ClInclude Include="..\..\..\cds\intrusive\moir_queue.h" />
@@ -966,7 +967,6 @@
     <ClInclude Include="..\..\..\cds\container\michael_list_hp.h" />
     <ClInclude Include="..\..\..\cds\container\michael_list_hrc.h" />
     <ClInclude Include="..\..\..\cds\container\michael_list_nogc.h" />
-    <ClInclude Include="..\..\..\cds\container\michael_list_ptb.h" />
     <ClInclude Include="..\..\..\cds\container\michael_map.h" />
     <ClInclude Include="..\..\..\cds\container\michael_map_nogc.h" />
     <ClInclude Include="..\..\..\cds\container\michael_set.h" />
diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index 287f6d9a..85d01e75 100644
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -560,9 +560,6 @@
     <ClInclude Include="..\..\..\cds\intrusive\michael_list_nogc.h">
       <Filter>Header Files\cds\intrusive</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\intrusive\michael_list_ptb.h">
-      <Filter>Header Files\cds\intrusive</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\intrusive\michael_set.h">
       <Filter>Header Files\cds\intrusive</Filter>
     </ClInclude>
@@ -653,9 +650,6 @@
     <ClInclude Include="..\..\..\cds\container\michael_list_nogc.h">
       <Filter>Header Files\cds\container</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\container\michael_list_ptb.h">
-      <Filter>Header Files\cds\container</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\container\michael_map.h">
       <Filter>Header Files\cds\container</Filter>
     </ClInclude>
@@ -1259,5 +1253,11 @@
     <ClInclude Include="..\..\..\cds\gc\dhp.h">
       <Filter>Header Files\cds\gc</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\cds\container\michael_list_dhp.h">
+      <Filter>Header Files\cds\container</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\cds\intrusive\michael_list_dhp.h">
+      <Filter>Header Files\cds\intrusive</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/test-hdr/map/hdr_splitlist_map_ptb.cpp b/tests/test-hdr/map/hdr_splitlist_map_ptb.cpp
index a09ae3cb..113b8245 100644
--- a/tests/test-hdr/map/hdr_splitlist_map_ptb.cpp
+++ b/tests/test-hdr/map/hdr_splitlist_map_ptb.cpp
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "map/hdr_map.h"
-#include <cds/container/michael_list_ptb.h>
+#include <cds/container/michael_list_dhp.h>
 #include <cds/container/split_list_map.h>
 
 namespace map {
diff --git a/tests/test-hdr/ordered_list/hdr_intrusive_michael_ptb.cpp b/tests/test-hdr/ordered_list/hdr_intrusive_michael_ptb.cpp
index ee984bf1..fed0ec88 100644
--- a/tests/test-hdr/ordered_list/hdr_intrusive_michael_ptb.cpp
+++ b/tests/test-hdr/ordered_list/hdr_intrusive_michael_ptb.cpp
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "ordered_list/hdr_intrusive_michael.h"
-#include <cds/intrusive/michael_list_ptb.h>
+#include <cds/intrusive/michael_list_dhp.h>
 
 namespace ordlist {
     void IntrusiveMichaelListHeaderTest::PTB_base_cmp()
diff --git a/tests/test-hdr/ordered_list/hdr_michael_ptb.cpp b/tests/test-hdr/ordered_list/hdr_michael_ptb.cpp
index ef8cfe70..0dfb8ac0 100644
--- a/tests/test-hdr/ordered_list/hdr_michael_ptb.cpp
+++ b/tests/test-hdr/ordered_list/hdr_michael_ptb.cpp
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "ordered_list/hdr_michael.h"
-#include <cds/container/michael_list_ptb.h>
+#include <cds/container/michael_list_dhp.h>
 
 namespace ordlist {
     namespace {
diff --git a/tests/test-hdr/set/hdr_intrusive_michael_set_ptb.cpp b/tests/test-hdr/set/hdr_intrusive_michael_set_ptb.cpp
index d079a217..016f125e 100644
--- a/tests/test-hdr/set/hdr_intrusive_michael_set_ptb.cpp
+++ b/tests/test-hdr/set/hdr_intrusive_michael_set_ptb.cpp
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "set/hdr_intrusive_set.h"
-#include <cds/intrusive/michael_list_ptb.h>
+#include <cds/intrusive/michael_list_dhp.h>
 #include <cds/intrusive/michael_set.h>
 
 namespace set {
diff --git a/tests/test-hdr/set/hdr_intrusive_splitlist_set_ptb.cpp b/tests/test-hdr/set/hdr_intrusive_splitlist_set_ptb.cpp
index f9c30ed8..01181eb2 100644
--- a/tests/test-hdr/set/hdr_intrusive_splitlist_set_ptb.cpp
+++ b/tests/test-hdr/set/hdr_intrusive_splitlist_set_ptb.cpp
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "set/hdr_intrusive_set.h"
-#include <cds/intrusive/michael_list_ptb.h>
+#include <cds/intrusive/michael_list_dhp.h>
 #include <cds/intrusive/split_list.h>
 
 namespace set {
diff --git a/tests/test-hdr/set/hdr_michael_set_ptb.cpp b/tests/test-hdr/set/hdr_michael_set_ptb.cpp
index 0b292ec1..0d4305e0 100644
--- a/tests/test-hdr/set/hdr_michael_set_ptb.cpp
+++ b/tests/test-hdr/set/hdr_michael_set_ptb.cpp
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "set/hdr_set.h"
-#include <cds/container/michael_list_ptb.h>
+#include <cds/container/michael_list_dhp.h>
 #include <cds/container/michael_set.h>
 
 namespace set {
diff --git a/tests/test-hdr/set/hdr_splitlist_set_ptb.cpp b/tests/test-hdr/set/hdr_splitlist_set_ptb.cpp
index 38e7f7a5..058c9469 100644
--- a/tests/test-hdr/set/hdr_splitlist_set_ptb.cpp
+++ b/tests/test-hdr/set/hdr_splitlist_set_ptb.cpp
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "set/hdr_set.h"
-#include <cds/container/michael_list_ptb.h>
+#include <cds/container/michael_list_dhp.h>
 #include <cds/container/split_list_set.h>
 
 namespace set {
diff --git a/tests/unit/set2/set_types.h b/tests/unit/set2/set_types.h
index a2baa7fe..6b5d5de3 100644
--- a/tests/unit/set2/set_types.h
+++ b/tests/unit/set2/set_types.h
@@ -11,7 +11,7 @@
 
 #include <cds/container/michael_list_hp.h>
 #include <cds/container/michael_list_hrc.h>
-#include <cds/container/michael_list_ptb.h>
+#include <cds/container/michael_list_dhp.h>
 #include <cds/container/michael_list_rcu.h>
 #include <cds/container/lazy_list_hp.h>
 #include <cds/container/lazy_list_hrc.h>
-- 
2.34.1