Merged VC 14.1 projects to VC14

diff --git a/projects/Win/vc14/cds.vcxproj b/projects/Win/vc14/cds.vcxproj
index eefbbd66da3fb6727237b3bdc6b1d5383fc3a6c3..91071fe4bc4f7998cbe887df88e590787c069c5c 100644 (file)
--- a/projects/Win/vc14/cds.vcxproj
+++ b/projects/Win/vc14/cds.vcxproj
@@ -506,6 +506,7 @@
     <ClInclude Include="..\..\..\cds\container\striped_set\std_list.h" />\r
     <ClInclude Include="..\..\..\cds\container\striped_set\std_set.h" />\r
     <ClInclude Include="..\..\..\cds\container\striped_set\std_vector.h" />\r
+    <ClInclude Include="..\..\..\cds\container\weak_ringbuffer.h" />\r
     <ClInclude Include="..\..\..\cds\details\binary_functor_wrapper.h" />\r
     <ClInclude Include="..\..\..\cds\details\bit_reverse_counter.h" />\r
     <ClInclude Include="..\..\..\cds\details\bounded_container.h" />\r

diff --git a/projects/Win/vc14/cds.vcxproj.filters b/projects/Win/vc14/cds.vcxproj.filters
index 14c57dae9d086059f63eda156511878093d554bc..f362b391fd34f8c62ea86c48818abd6e51519da5 100644 (file)
--- a/projects/Win/vc14/cds.vcxproj.filters
+++ b/projects/Win/vc14/cds.vcxproj.filters
@@ -147,11 +147,11 @@
     <Filter Include="Header Files\cds\container\impl">\r
       <UniqueIdentifier>{0a2328b4-ff6f-4afb-8de0-9884ae172fa9}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="Header Files\cds\compiler\gcc\arm7">\r
-      <UniqueIdentifier>{8f1fe8df-3837-42fd-a2f7-581aaf653c53}</UniqueIdentifier>\r
-    </Filter>\r
     <Filter Include="Header Files\cds\compiler\gcc\arm8">\r
-      <UniqueIdentifier>{fb32845c-1b47-49d0-8065-4a0aa4b55d6d}</UniqueIdentifier>\r
+      <UniqueIdentifier>{151e21e7-1535-430a-a7d1-676b93d8162c}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Header Files\cds\compiler\gcc\arm7">\r
+      <UniqueIdentifier>{754f330c-8443-4012-b05b-41b3eba647f9}</UniqueIdentifier>\r
     </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
@@ -1246,14 +1246,17 @@
     <ClInclude Include="..\..\..\cds\details\throw_exception.h">\r
       <Filter>Header Files\cds\details</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\compiler\gcc\arm7\backoff.h">\r
-      <Filter>Header Files\cds\compiler\gcc\arm7</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\..\cds\compiler\gcc\arm8\backoff.h">\r
       <Filter>Header Files\cds\compiler\gcc\arm8</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\..\cds\compiler\gcc\arm7\backoff.h">\r
+      <Filter>Header Files\cds\compiler\gcc\arm7</Filter>\r
+    </ClInclude>\r
     <ClInclude Include="..\..\..\cds\algo\bit_reversal.h">\r
       <Filter>Header Files\cds\algo</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\..\cds\container\weak_ringbuffer.h">\r
+      <Filter>Header Files\cds\container</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/projects/Win/vc14/gtest-iset-michael-iterable.vcxproj b/projects/Win/vc14/gtest-iset-michael-iterable.vcxproj
index bc42ee96604dd5b258cdb6df873e4d43e968733b..fe83711f8a9915aa8c761a92325a2eeaf53709da 100644 (file)
--- a/projects/Win/vc14/gtest-iset-michael-iterable.vcxproj
+++ b/projects/Win/vc14/gtest-iset-michael-iterable.vcxproj
@@ -36,8 +36,6 @@
     <ClInclude Include="..\..\..\test\unit\intrusive-set\test_intrusive_michael_iterable_hp.h" />
     <ClInclude Include="..\..\..\test\unit\intrusive-set\test_intrusive_set.h" />
     <ClInclude Include="..\..\..\test\unit\intrusive-set\test_intrusive_set_hp.h" />
-    <ClInclude Include="..\..\..\test\unit\intrusive-set\test_intrusive_set_nogc.h" />
-    <ClInclude Include="..\..\..\test\unit\intrusive-set\test_intrusive_set_rcu.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{2A3D25FA-16AB-4105-9585-EF5266979989}</ProjectGuid>

diff --git a/projects/Win/vc14/gtest-iset-split-iterable.vcxproj b/projects/Win/vc14/gtest-iset-split-iterable.vcxproj
index 58e16c0a4193581262973f0bcdd2f6abd3ea52c8..245c28c54d49e0825786cc11c87f21a9908fd699 100644 (file)
--- a/projects/Win/vc14/gtest-iset-split-iterable.vcxproj
+++ b/projects/Win/vc14/gtest-iset-split-iterable.vcxproj
@@ -34,8 +34,6 @@
   <ItemGroup>
     <ClInclude Include="..\..\..\test\unit\intrusive-set\test_intrusive_set.h" />
     <ClInclude Include="..\..\..\test\unit\intrusive-set\test_intrusive_set_hp.h" />
-    <ClInclude Include="..\..\..\test\unit\intrusive-set\test_intrusive_set_nogc.h" />
-    <ClInclude Include="..\..\..\test\unit\intrusive-set\test_intrusive_set_rcu.h" />
     <ClInclude Include="..\..\..\test\unit\intrusive-set\test_intrusive_split_iterable_set.h" />
     <ClInclude Include="..\..\..\test\unit\intrusive-set\test_intrusive_split_iterable_set_hp.h" />
   </ItemGroup>

diff --git a/projects/Win/vc14/gtest-list-iterable.vcxproj b/projects/Win/vc14/gtest-list-iterable.vcxproj
index 52bcc53f7e40f756c4741137a59b94c53048dc1f..85f31de2702a5802d1462a39bc97b055542e955d 100644 (file)
--- a/projects/Win/vc14/gtest-list-iterable.vcxproj
+++ b/projects/Win/vc14/gtest-list-iterable.vcxproj
@@ -33,10 +33,8 @@
     <ClInclude Include="..\..\..\test\unit\list\test_kv_iterable_list_hp.h" />
     <ClInclude Include="..\..\..\test\unit\list\test_kv_list.h" />
     <ClInclude Include="..\..\..\test\unit\list\test_kv_list_hp.h" />
-    <ClInclude Include="..\..\..\test\unit\list\test_kv_list_rcu.h" />
     <ClInclude Include="..\..\..\test\unit\list\test_list.h" />
     <ClInclude Include="..\..\..\test\unit\list\test_list_hp.h" />
-    <ClInclude Include="..\..\..\test\unit\list\test_list_rcu.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\test\unit\list\iterable_dhp.cpp" />

diff --git a/projects/Win/vc14/gtest-map-skip.vcxproj b/projects/Win/vc14/gtest-map-skip.vcxproj
index bb7f622e1d376a38a517a55f61a2bf8b4d1fd9b0..fc9de3e0b0379203e2b5aa671beb2d3a18c9f2ca 100644 (file)
--- a/projects/Win/vc14/gtest-map-skip.vcxproj
+++ b/projects/Win/vc14/gtest-map-skip.vcxproj
@@ -51,6 +51,7 @@
     <ClCompile Include="..\..\..\test\unit\map\skiplist_rcu_shb.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\test\unit\map\skiplist_hp_inl.h" />
     <ClInclude Include="..\..\..\test\unit\map\test_feldman_hashmap.h" />
     <ClInclude Include="..\..\..\test\unit\map\test_map.h" />
     <ClInclude Include="..\..\..\test\unit\map\test_map_data.h" />

diff --git a/projects/Win/vc14/gtest-map-split-iterable.vcxproj b/projects/Win/vc14/gtest-map-split-iterable.vcxproj
index 7760500fcf56ec24097666cd8518e2f158824a60..e6ee2f1d5ea8d0725965bbcd4a70e853ae81e30a 100644 (file)
--- a/projects/Win/vc14/gtest-map-split-iterable.vcxproj
+++ b/projects/Win/vc14/gtest-map-split-iterable.vcxproj
@@ -32,11 +32,9 @@
     <ClCompile Include="..\..\..\test\unit\map\split_iterable_hp.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\test\unit\map\test_map.h" />
     <ClInclude Include="..\..\..\test\unit\map\test_map_data.h" />
-    <ClInclude Include="..\..\..\test\unit\map\test_map_hp.h" />
-    <ClInclude Include="..\..\..\test\unit\map\test_map_nogc.h" />
-    <ClInclude Include="..\..\..\test\unit\map\test_map_rcu.h" />
+    <ClInclude Include="..\..\..\test\unit\map\test_michael_iterable.h" />
+    <ClInclude Include="..\..\..\test\unit\map\test_michael_iterable_hp.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{B7C62D31-ED28-4D85-AA01-D1071E870080}</ProjectGuid>

diff --git a/projects/Win/vc14/gtest-queue.vcxproj b/projects/Win/vc14/gtest-queue.vcxproj
index 28f044fbc20837c9bbcb3c0d76f6c3e2c1f05fd1..bcbb5ffa222e83e6b7462699a37d76569e529d1a 100644 (file)
--- a/projects/Win/vc14/gtest-queue.vcxproj
+++ b/projects/Win/vc14/gtest-queue.vcxproj
@@ -55,6 +55,7 @@
     </ClCompile>\r
     <ClCompile Include="..\..\..\test\unit\queue\segmented_queue_hp.cpp" />\r
     <ClCompile Include="..\..\..\test\unit\queue\vyukov_mpmc_queue.cpp" />\r
+    <ClCompile Include="..\..\..\test\unit\queue\weak_ringbuffer.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\..\test\unit\queue\test_bounded_queue.h" />\r

diff --git a/projects/Win/vc14/gtest-set-skip.vcxproj b/projects/Win/vc14/gtest-set-skip.vcxproj
index be8e82bc95f633e43564593f26409262d9f92089..84dcf0ba19b964fc32b12ace3fb9abfe5fd879aa 100644 (file)
--- a/projects/Win/vc14/gtest-set-skip.vcxproj
+++ b/projects/Win/vc14/gtest-set-skip.vcxproj
@@ -51,6 +51,7 @@
     <ClCompile Include="..\..\..\test\unit\set\skiplist_rcu_shb.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\test\unit\set\skiplist_hp_inl.h" />
     <ClInclude Include="..\..\..\test\unit\set\test_ordered_set_hp.h" />
     <ClInclude Include="..\..\..\test\unit\set\test_set.h" />
     <ClInclude Include="..\..\..\test\unit\set\test_set_data.h" />

diff --git a/projects/Win/vc14/gtest-set-split-iterable.vcxproj b/projects/Win/vc14/gtest-set-split-iterable.vcxproj
index 01b0f9a169efc8fe0cbce60799107db5ca9ec579..8aefc5cf99b677d8a60ae094552c8d3586f21332 100644 (file)
--- a/projects/Win/vc14/gtest-set-split-iterable.vcxproj
+++ b/projects/Win/vc14/gtest-set-split-iterable.vcxproj
@@ -32,12 +32,7 @@
     <ClCompile Include="..\..\..\test\unit\set\split_iterable_hp.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\test\unit\set\test_ordered_set_hp.h" />
-    <ClInclude Include="..\..\..\test\unit\set\test_set.h" />
     <ClInclude Include="..\..\..\test\unit\set\test_set_data.h" />
-    <ClInclude Include="..\..\..\test\unit\set\test_set_hp.h" />
-    <ClInclude Include="..\..\..\test\unit\set\test_set_nogc.h" />
-    <ClInclude Include="..\..\..\test\unit\set\test_set_rcu.h" />
     <ClInclude Include="..\..\..\test\unit\set\test_split_iterable.h" />
     <ClInclude Include="..\..\..\test\unit\set\test_split_iterable_hp.h" />
   </ItemGroup>

diff --git a/projects/Win/vc14/stress-queue.vcxproj.filters b/projects/Win/vc14/stress-queue.vcxproj.filters
deleted file mode 100644 (file)
index f65383d..0000000
--- a/projects/Win/vc14/stress-queue.vcxproj.filters
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup>\r
-    <Filter Include="Source Files">\r
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
-    </Filter>\r
-    <Filter Include="Header Files">\r
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
-    </Filter>\r
-    <Filter Include="Resource Files">\r
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
-    </Filter>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ClCompile Include="..\..\..\test\stress\main.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\..\test\stress\queue\push.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\..\test\stress\queue\pop.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\..\test\stress\queue\push_pop.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\..\test\stress\queue\random.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\..\test\stress\queue\bounded_queue_fulness.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\..\test\stress\queue\intrusive_push_pop.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ClInclude Include="..\..\..\test\stress\queue\queue_type.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\..\test\stress\queue\std_queue.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\..\test\stress\queue\intrusive_queue_type.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\..\test\stress\queue\print_stat.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-  </ItemGroup>\r
-</Project>
\ No newline at end of file