fix makefiles and projects

diff --git a/projects/Win/vc12/hdr-test-ordered-list.vcxproj.filters b/projects/Win/vc12/hdr-test-ordered-list.vcxproj.filters
index 42a6bc92d423be80847d3e8e79b86aa39f97a7a4..f4e393ae4d78237960ba7e65d51a34dc629d54ae 100644 (file)
--- a/projects/Win/vc12/hdr-test-ordered-list.vcxproj.filters
+++ b/projects/Win/vc12/hdr-test-ordered-list.vcxproj.filters
@@ -136,6 +136,15 @@
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_kv_dhp.cpp">\r
       <Filter>container</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_intrusive_michael_dhp.cpp">\r
+      <Filter>intrusive</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_michael_dhp.cpp">\r
+      <Filter>container</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_michael_kv_dhp.cpp">\r
+      <Filter>container</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\..\tests\test-hdr\ordered_list\hdr_intrusive_lazy.h">\r

diff --git a/projects/source.test-hdr.mk b/projects/source.test-hdr.mk
index 6e77b12381ebf8230f0a22df8c80b86fbf9e0f4b..c2b0f70d90e9a1f3525b8206fa1595e8476f927a 100644 (file)
--- a/projects/source.test-hdr.mk
+++ b/projects/source.test-hdr.mk
@@ -64,20 +64,17 @@ CDS_TESTHDR_DEQUE := \
     tests/test-hdr/deque/hdr_fcdeque.cpp
 
 CDS_TESTHDR_ORDLIST := \
-    tests/test-hdr/ordered_list/hdr_intrusive_lazy_hrc.cpp \
+    tests/test-hdr/ordered_list/hdr_lazy_dhp.cpp \
     tests/test-hdr/ordered_list/hdr_lazy_hp.cpp \
-    tests/test-hdr/ordered_list/hdr_lazy_hrc.cpp \
     tests/test-hdr/ordered_list/hdr_lazy_nogc.cpp \
-    tests/test-hdr/ordered_list/hdr_lazy_ptb.cpp \
     tests/test-hdr/ordered_list/hdr_lazy_rcu_gpi.cpp \
     tests/test-hdr/ordered_list/hdr_lazy_rcu_gpb.cpp \
     tests/test-hdr/ordered_list/hdr_lazy_rcu_gpt.cpp \
     tests/test-hdr/ordered_list/hdr_lazy_rcu_shb.cpp \
     tests/test-hdr/ordered_list/hdr_lazy_rcu_sht.cpp \
+    tests/test-hdr/ordered_list/hdr_lazy_kv_dhp.cpp \
     tests/test-hdr/ordered_list/hdr_lazy_kv_hp.cpp \
-    tests/test-hdr/ordered_list/hdr_lazy_kv_hrc.cpp \
     tests/test-hdr/ordered_list/hdr_lazy_kv_nogc.cpp \
-    tests/test-hdr/ordered_list/hdr_lazy_kv_ptb.cpp \
     tests/test-hdr/ordered_list/hdr_lazy_kv_rcu_gpb.cpp \
     tests/test-hdr/ordered_list/hdr_lazy_kv_rcu_gpi.cpp \
     tests/test-hdr/ordered_list/hdr_lazy_kv_rcu_gpt.cpp \

diff --git a/projects/source.test-hdr.offsetof.mk b/projects/source.test-hdr.offsetof.mk
index 4ac669bae058a46209d9c84f35f712ecb8e1cb41..999ef143f25386f4cd90e690e0a0324a3c5c9c06 100644 (file)
--- a/projects/source.test-hdr.offsetof.mk
+++ b/projects/source.test-hdr.offsetof.mk
@@ -49,17 +49,17 @@ CDS_TESTHDR_OFFSETOF_SET := \
     tests/test-hdr/set/hdr_intrusive_splitlist_set_rcu_sht_lazy.cpp 
 
 CDS_TESTHDR_OFFSETOF_ORDLIST := \
+    tests/test-hdr/ordered_list/hdr_intrusive_lazy_dhp.cpp \
     tests/test-hdr/ordered_list/hdr_intrusive_lazy_hp.cpp \
     tests/test-hdr/ordered_list/hdr_intrusive_lazy_nogc.cpp \
-    tests/test-hdr/ordered_list/hdr_intrusive_lazy_ptb.cpp \
     tests/test-hdr/ordered_list/hdr_intrusive_lazy_rcu_gpb.cpp \
     tests/test-hdr/ordered_list/hdr_intrusive_lazy_rcu_gpi.cpp \
     tests/test-hdr/ordered_list/hdr_intrusive_lazy_rcu_gpt.cpp \
     tests/test-hdr/ordered_list/hdr_intrusive_lazy_rcu_shb.cpp \
     tests/test-hdr/ordered_list/hdr_intrusive_lazy_rcu_sht.cpp \
+    tests/test-hdr/ordered_list/hdr_intrusive_michael_dhp.cpp \
     tests/test-hdr/ordered_list/hdr_intrusive_michael_hp.cpp \
     tests/test-hdr/ordered_list/hdr_intrusive_michael_nogc.cpp \
-    tests/test-hdr/ordered_list/hdr_intrusive_michael_dhp.cpp \
     tests/test-hdr/ordered_list/hdr_intrusive_michael_list_rcu_gpb.cpp \
     tests/test-hdr/ordered_list/hdr_intrusive_michael_list_rcu_gpi.cpp \
     tests/test-hdr/ordered_list/hdr_intrusive_michael_list_rcu_gpt.cpp \