From: khizmax <libcds.dev@gmail.com>
Date: Thu, 23 Oct 2014 18:04:23 +0000 (+0400)
Subject: Merge commit '7999eaee97df27c88866d1dfd130068dba955e88' into dev
X-Git-Tag: v2.0.0~178
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=92c1bbab088df29ed018aa6bd73a18277109e04e;p=libcds.git

Merge commit '7999eaee97df27c88866d1dfd130068dba955e88' into dev

Conflicts:
	projects/Win/vc12/hdr-test-ordered-list.vcxproj
	projects/Win/vc12/hdr-test-ordered-list.vcxproj.filters
---

92c1bbab088df29ed018aa6bd73a18277109e04e
diff --cc projects/Win/vc12/hdr-test-ordered-list.vcxproj
index 12eb0167,4c2e1948..dee2447c
--- a/projects/Win/vc12/hdr-test-ordered-list.vcxproj
+++ b/projects/Win/vc12/hdr-test-ordered-list.vcxproj
@@@ -558,12 -560,12 +559,11 @@@
      <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_intrusive_michael_list_rcu_shb.cpp" />
      <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_intrusive_michael_list_rcu_sht.cpp" />
      <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_intrusive_michael_nogc.cpp" />
-     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_intrusive_michael_ptb.cpp" />
 +    <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_dhp.cpp" />
      <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_hp.cpp" />
 -    <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_hrc.cpp" />
 +    <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_kv_dhp.cpp" />
      <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_kv_hp.cpp" />
 -    <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_kv_hrc.cpp" />
      <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_kv_nogc.cpp" />
 -    <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_kv_ptb.cpp" />
      <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_kv_rcu_gpb.cpp" />
      <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_kv_rcu_gpi.cpp" />
      <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_kv_rcu_gpt.cpp" />