From 325051d5af141257437148a4ded3c20b15c4d91a Mon Sep 17 00:00:00 2001
From: khizmax <libcds.dev@gmail.com>
Date: Wed, 22 Oct 2014 09:30:07 +0400
Subject: [PATCH] rename michael_kvlist_pth.h to michael_kvlist_dhp.h

---
 cds/container/impl/michael_kvlist.h                         | 2 +-
 .../{michael_kvlist_ptb.h => michael_kvlist_dhp.h}          | 6 +++---
 projects/Win/vc12/cds.vcxproj                               | 2 +-
 projects/Win/vc12/cds.vcxproj.filters                       | 6 +++---
 tests/test-hdr/map/hdr_michael_map_ptb.cpp                  | 2 +-
 tests/test-hdr/ordered_list/hdr_michael_kv_ptb.cpp          | 2 +-
 tests/unit/map2/map_types.h                                 | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)
 rename cds/container/{michael_kvlist_ptb.h => michael_kvlist_dhp.h} (60%)

diff --git a/cds/container/impl/michael_kvlist.h b/cds/container/impl/michael_kvlist.h
index 8621b6f4..0043330d 100644
--- a/cds/container/impl/michael_kvlist.h
+++ b/cds/container/impl/michael_kvlist.h
@@ -76,7 +76,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_kvlist_hp.h> \endcode
-        - for gc::PTB: \code #include <cds/container/michael_kvlist_ptb.h> \endcode
+        - for gc::DHP: \code #include <cds/container/michael_kvlist_dhp.h> \endcode
         - for \ref cds_urcu_desc "RCU": \code #include <cds/container/michael_kvlist_rcu.h> \endcode
         - for gc::nogc: \code #include <cds/container/michael_kvlist_nogc.h> \endcode
     */
diff --git a/cds/container/michael_kvlist_ptb.h b/cds/container/michael_kvlist_dhp.h
similarity index 60%
rename from cds/container/michael_kvlist_ptb.h
rename to cds/container/michael_kvlist_dhp.h
index aef357f9..5011a02a 100644
--- a/cds/container/michael_kvlist_ptb.h
+++ b/cds/container/michael_kvlist_dhp.h
@@ -1,11 +1,11 @@
 //$$CDS-header$$
 
-#ifndef __CDS_CONTAINER_MICHAEL_KVLIST_PTB_H
-#define __CDS_CONTAINER_MICHAEL_KVLIST_PTB_H
+#ifndef __CDS_CONTAINER_MICHAEL_KVLIST_DHP_H
+#define __CDS_CONTAINER_MICHAEL_KVLIST_DHP_H
 
 #include <cds/container/details/michael_list_base.h>
 #include <cds/intrusive/michael_list_dhp.h>
 #include <cds/container/details/make_michael_kvlist.h>
 #include <cds/container/impl/michael_kvlist.h>
 
-#endif  // #ifndef __CDS_CONTAINER_MICHAEL_KVLIST_PTB_H
+#endif  // #ifndef __CDS_CONTAINER_MICHAEL_KVLIST_DHP_H
diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index 4df3bea0..5ef0fedf 100644
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -684,6 +684,7 @@
     <ClInclude Include="..\..\..\cds\container\impl\skip_list_set.h" />
     <ClInclude Include="..\..\..\cds\container\lazy_kvlist_rcu.h" />
     <ClInclude Include="..\..\..\cds\container\lazy_list_rcu.h" />
+    <ClInclude Include="..\..\..\cds\container\michael_kvlist_dhp.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" />
@@ -963,7 +964,6 @@
     <ClInclude Include="..\..\..\cds\container\michael_kvlist_hp.h" />
     <ClInclude Include="..\..\..\cds\container\michael_kvlist_hrc.h" />
     <ClInclude Include="..\..\..\cds\container\michael_kvlist_nogc.h" />
-    <ClInclude Include="..\..\..\cds\container\michael_kvlist_ptb.h" />
     <ClInclude Include="..\..\..\cds\container\michael_list_hp.h" />
     <ClInclude Include="..\..\..\cds\container\michael_list_hrc.h" />
     <ClInclude Include="..\..\..\cds\container\michael_list_nogc.h" />
diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index 85d01e75..65c5e3f5 100644
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -638,9 +638,6 @@
     <ClInclude Include="..\..\..\cds\container\michael_kvlist_nogc.h">
       <Filter>Header Files\cds\container</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\container\michael_kvlist_ptb.h">
-      <Filter>Header Files\cds\container</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\container\michael_list_hp.h">
       <Filter>Header Files\cds\container</Filter>
     </ClInclude>
@@ -1259,5 +1256,8 @@
     <ClInclude Include="..\..\..\cds\intrusive\michael_list_dhp.h">
       <Filter>Header Files\cds\intrusive</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\cds\container\michael_kvlist_dhp.h">
+      <Filter>Header Files\cds\container</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/test-hdr/map/hdr_michael_map_ptb.cpp b/tests/test-hdr/map/hdr_michael_map_ptb.cpp
index 49cab8d6..3c1b25a5 100644
--- a/tests/test-hdr/map/hdr_michael_map_ptb.cpp
+++ b/tests/test-hdr/map/hdr_michael_map_ptb.cpp
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "map/hdr_map.h"
-#include <cds/container/michael_kvlist_ptb.h>
+#include <cds/container/michael_kvlist_dhp.h>
 #include <cds/container/michael_map.h>
 
 namespace map {
diff --git a/tests/test-hdr/ordered_list/hdr_michael_kv_ptb.cpp b/tests/test-hdr/ordered_list/hdr_michael_kv_ptb.cpp
index 811e58b9..b66b3d37 100644
--- a/tests/test-hdr/ordered_list/hdr_michael_kv_ptb.cpp
+++ b/tests/test-hdr/ordered_list/hdr_michael_kv_ptb.cpp
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "ordered_list/hdr_michael_kv.h"
-#include <cds/container/michael_kvlist_ptb.h>
+#include <cds/container/michael_kvlist_dhp.h>
 
 namespace ordlist {
     namespace {
diff --git a/tests/unit/map2/map_types.h b/tests/unit/map2/map_types.h
index add04d47..aefc04ff 100644
--- a/tests/unit/map2/map_types.h
+++ b/tests/unit/map2/map_types.h
@@ -11,7 +11,7 @@
 
 #include <cds/container/michael_kvlist_hp.h>
 #include <cds/container/michael_kvlist_hrc.h>
-#include <cds/container/michael_kvlist_ptb.h>
+#include <cds/container/michael_kvlist_dhp.h>
 #include <cds/container/michael_kvlist_rcu.h>
 #include <cds/container/michael_kvlist_nogc.h>
 
-- 
2.34.1