rename michael_kvlist_pth.h to michael_kvlist_dhp.h

diff --git a/cds/container/impl/michael_kvlist.h b/cds/container/impl/michael_kvlist.h
index 8621b6f430207a64a61824bfb99fad7ec2ea1840..0043330db1112479d69668341e18eda4e788ddcd 100644 (file)
--- 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_dhp.h b/cds/container/michael_kvlist_dhp.h
new file mode 100644 (file)
index 0000000..5011a02
--- /dev/null
+++ b/cds/container/michael_kvlist_dhp.h
@@ -0,0 +1,11 @@
+//$$CDS-header$$
+
+#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_DHP_H

diff --git a/cds/container/michael_kvlist_ptb.h b/cds/container/michael_kvlist_ptb.h
deleted file mode 100644 (file)
index aef357f..0000000
--- a/cds/container/michael_kvlist_ptb.h
+++ /dev/null
@@ -1,11 +0,0 @@
-//$$CDS-header$$
-
-#ifndef __CDS_CONTAINER_MICHAEL_KVLIST_PTB_H
-#define __CDS_CONTAINER_MICHAEL_KVLIST_PTB_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

diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index 4df3bea032a0ebb3ce71f116c84dbb0605ae0692..5ef0fedf9b6d521dbb1bdefc295b56b5f79f75d4 100644 (file)
--- 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" />\r
     <ClInclude Include="..\..\..\cds\container\lazy_kvlist_rcu.h" />\r
     <ClInclude Include="..\..\..\cds\container\lazy_list_rcu.h" />\r
+    <ClInclude Include="..\..\..\cds\container\michael_kvlist_dhp.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_kvlist_rcu.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_list_dhp.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_list_rcu.h" />\r
@@ -963,7 +964,6 @@
     <ClInclude Include="..\..\..\cds\container\michael_kvlist_hp.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_kvlist_hrc.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_kvlist_nogc.h" />\r
-    <ClInclude Include="..\..\..\cds\container\michael_kvlist_ptb.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_list_hp.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_list_hrc.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_list_nogc.h" />\r

diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index 85d01e757b807e7bdc070c2e19ab1140961e1413..65c5e3f5bfb0d4863af46daec31f68cef90854c6 100644 (file)
--- 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">\r
       <Filter>Header Files\cds\container</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\container\michael_kvlist_ptb.h">\r
-      <Filter>Header Files\cds\container</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\..\cds\container\michael_list_hp.h">\r
       <Filter>Header Files\cds\container</Filter>\r
     </ClInclude>\r
@@ -1259,5 +1256,8 @@
     <ClInclude Include="..\..\..\cds\intrusive\michael_list_dhp.h">\r
       <Filter>Header Files\cds\intrusive</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\..\cds\container\michael_kvlist_dhp.h">\r
+      <Filter>Header Files\cds\container</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
 </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 49cab8d6f6a6f251df3dcfd9afc94b514668bca1..3c1b25a506f0d77ee8a7886fb012d8d8c52e3f11 100644 (file)
--- 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 811e58b96222f3840b05a68b5b7954d040adcc2a..b66b3d37604fba4171a6596fbe177c81eb62a1cd 100644 (file)
--- 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 add04d47eb26c493557a3423f42da7c0633bf2c3..aefc04ff85f4332e36167ffe86f2b831e7543709 100644 (file)
--- 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>