From: khizmax <libcds.dev@gmail.com>
Date: Sat, 13 May 2017 16:43:04 +0000 (+0300)
Subject: Merged VC 14.1 projects to VC14
X-Git-Tag: v2.3.0~30
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;ds=sidebyside;h=4a99ecc4467546b9ff56105d2307dc4dad096906;p=libcds.git

Merged VC 14.1 projects to VC14
---

diff --git a/projects/Win/vc14/cds.vcxproj b/projects/Win/vc14/cds.vcxproj
index eefbbd66..91071fe4 100644
--- 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" />
     <ClInclude Include="..\..\..\cds\container\striped_set\std_set.h" />
     <ClInclude Include="..\..\..\cds\container\striped_set\std_vector.h" />
+    <ClInclude Include="..\..\..\cds\container\weak_ringbuffer.h" />
     <ClInclude Include="..\..\..\cds\details\binary_functor_wrapper.h" />
     <ClInclude Include="..\..\..\cds\details\bit_reverse_counter.h" />
     <ClInclude Include="..\..\..\cds\details\bounded_container.h" />
diff --git a/projects/Win/vc14/cds.vcxproj.filters b/projects/Win/vc14/cds.vcxproj.filters
index 14c57dae..f362b391 100644
--- 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">
       <UniqueIdentifier>{0a2328b4-ff6f-4afb-8de0-9884ae172fa9}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\cds\compiler\gcc\arm7">
-      <UniqueIdentifier>{8f1fe8df-3837-42fd-a2f7-581aaf653c53}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Header Files\cds\compiler\gcc\arm8">
-      <UniqueIdentifier>{fb32845c-1b47-49d0-8065-4a0aa4b55d6d}</UniqueIdentifier>
+      <UniqueIdentifier>{151e21e7-1535-430a-a7d1-676b93d8162c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\cds\compiler\gcc\arm7">
+      <UniqueIdentifier>{754f330c-8443-4012-b05b-41b3eba647f9}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -1246,14 +1246,17 @@
     <ClInclude Include="..\..\..\cds\details\throw_exception.h">
       <Filter>Header Files\cds\details</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\compiler\gcc\arm7\backoff.h">
-      <Filter>Header Files\cds\compiler\gcc\arm7</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\compiler\gcc\arm8\backoff.h">
       <Filter>Header Files\cds\compiler\gcc\arm8</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\cds\compiler\gcc\arm7\backoff.h">
+      <Filter>Header Files\cds\compiler\gcc\arm7</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\cds\algo\bit_reversal.h">
       <Filter>Header Files\cds\algo</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\cds\container\weak_ringbuffer.h">
+      <Filter>Header Files\cds\container</Filter>
+    </ClInclude>
   </ItemGroup>
 </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 bc42ee96..fe83711f 100644
--- 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 58e16c0a..245c28c5 100644
--- 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 52bcc53f..85f31de2 100644
--- 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 bb7f622e..fc9de3e0 100644
--- 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 7760500f..e6ee2f1d 100644
--- 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 28f044fb..bcbb5ffa 100644
--- a/projects/Win/vc14/gtest-queue.vcxproj
+++ b/projects/Win/vc14/gtest-queue.vcxproj
@@ -55,6 +55,7 @@
     </ClCompile>
     <ClCompile Include="..\..\..\test\unit\queue\segmented_queue_hp.cpp" />
     <ClCompile Include="..\..\..\test\unit\queue\vyukov_mpmc_queue.cpp" />
+    <ClCompile Include="..\..\..\test\unit\queue\weak_ringbuffer.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\test\unit\queue\test_bounded_queue.h" />
diff --git a/projects/Win/vc14/gtest-set-skip.vcxproj b/projects/Win/vc14/gtest-set-skip.vcxproj
index be8e82bc..84dcf0ba 100644
--- 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 01b0f9a1..8aefc5cf 100644
--- 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
index f65383d0..00000000
--- a/projects/Win/vc14/stress-queue.vcxproj.filters
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\test\stress\main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\test\stress\queue\push.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\test\stress\queue\pop.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\test\stress\queue\push_pop.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\test\stress\queue\random.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\test\stress\queue\bounded_queue_fulness.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\test\stress\queue\intrusive_push_pop.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\test\stress\queue\queue_type.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\test\stress\queue\std_queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\test\stress\queue\intrusive_queue_type.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\test\stress\queue\print_stat.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file