Updated MS VC 14 CTP projects

diff --git a/projects/Win/vc14/cds.vcxproj b/projects/Win/vc14/cds.vcxproj
index 73226d9249493327e7a62fc45f7cf4687b15c026..8d218ffff7cdec90583ba051cf7d40c9c5e619b3 100644 (file)
--- a/projects/Win/vc14/cds.vcxproj
+++ b/projects/Win/vc14/cds.vcxproj
@@ -148,48 +148,48 @@
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\..\..\bin\vc$(PlatformToolsetVersion)\$(Platform)\</OutDir>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ICL-Debug|Win32'">$(SolutionDir)..\..\..\bin\vc$(PlatformToolsetVersion)\$(Platform)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\..\..\obj\vc$(PlatformToolsetVersion)\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ICL-Debug|Win32'">$(SolutionDir)..\..\..\obj\vc$(PlatformToolsetVersion)\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\..\..\bin\vc12\$(Platform)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ICL-Debug|Win32'">$(SolutionDir)..\..\..\bin\vc12-icl\$(Platform)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\..\..\obj\vc12\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ICL-Debug|Win32'">$(SolutionDir)..\..\..\obj\vc12-icl\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ICL-Debug|Win32'">true</LinkIncremental>\r
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>\r
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ICL-Debug|Win32'">true</GenerateManifest>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\..\..\bin\vc$(PlatformToolsetVersion)\$(Platform)\</OutDir>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ICL-Debug|x64'">$(SolutionDir)..\..\..\bin\vc$(PlatformToolsetVersion)\$(Platform)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\..\..\obj\vc$(PlatformToolsetVersion)\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ICL-Debug|x64'">$(SolutionDir)..\..\..\obj\vc$(PlatformToolsetVersion)\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\..\..\bin\vc12\$(Platform)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ICL-Debug|x64'">$(SolutionDir)..\..\..\bin\vc12-icl\$(Platform)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\..\..\obj\vc12\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ICL-Debug|x64'">$(SolutionDir)..\..\..\obj\vc12-icl\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ICL-Debug|x64'">true</LinkIncremental>\r
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>\r
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ICL-Debug|x64'">true</GenerateManifest>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\..\..\bin\vc$(PlatformToolsetVersion)\$(Platform)\</OutDir>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ICL-Release|Win32'">$(SolutionDir)..\..\..\bin\vc$(PlatformToolsetVersion)\$(Platform)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\..\..\obj\vc$(PlatformToolsetVersion)\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ICL-Release|Win32'">$(SolutionDir)..\..\..\obj\vc$(PlatformToolsetVersion)\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\..\..\bin\vc12\$(Platform)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ICL-Release|Win32'">$(SolutionDir)..\..\..\bin\vc12-icl\$(Platform)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\..\..\obj\vc12\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ICL-Release|Win32'">$(SolutionDir)..\..\..\obj\vc12-icl\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ICL-Release|Win32'">false</LinkIncremental>\r
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>\r
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ICL-Release|Win32'">true</GenerateManifest>\r
     <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</PostBuildEventUseInBuild>\r
     <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='ICL-Release|Win32'">false</PostBuildEventUseInBuild>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\..\..\bin\vc$(PlatformToolsetVersion)\$(Platform)\</OutDir>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ICL-Release|x64'">$(SolutionDir)..\..\..\bin\vc$(PlatformToolsetVersion)\$(Platform)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\..\..\obj\vc$(PlatformToolsetVersion)\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ICL-Release|x64'">$(SolutionDir)..\..\..\obj\vc$(PlatformToolsetVersion)\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\..\..\bin\vc12\$(Platform)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ICL-Release|x64'">$(SolutionDir)..\..\..\bin\vc12-icl\$(Platform)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\..\..\obj\vc12\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ICL-Release|x64'">$(SolutionDir)..\..\..\obj\vc12-icl\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ICL-Release|x64'">false</LinkIncremental>\r
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>\r
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ICL-Release|x64'">true</GenerateManifest>\r
     <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</PostBuildEventUseInBuild>\r
     <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='ICL-Release|x64'">false</PostBuildEventUseInBuild>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugVLD|Win32'">$(SolutionDir)..\..\..\bin\vc$(PlatformToolsetVersion)\$(Platform)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugVLD|Win32'">$(SolutionDir)..\..\..\obj\vc$(PlatformToolsetVersion)\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugVLD|Win32'">$(SolutionDir)..\..\..\bin\vc12\$(Platform)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugVLD|Win32'">$(SolutionDir)..\..\..\obj\vc12\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DebugVLD|Win32'">true</LinkIncremental>\r
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DebugVLD|Win32'">true</GenerateManifest>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugVLD|x64'">$(SolutionDir)..\..\..\bin\vc$(PlatformToolsetVersion)\$(Platform)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugVLD|x64'">$(SolutionDir)..\..\..\obj\vc$(PlatformToolsetVersion)\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugVLD|x64'">$(SolutionDir)..\..\..\bin\vc12\$(Platform)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugVLD|x64'">$(SolutionDir)..\..\..\obj\vc12\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DebugVLD|x64'">true</LinkIncremental>\r
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DebugVLD|x64'">true</GenerateManifest>\r
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugVLD|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
@@ -222,16 +222,16 @@
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ICL-Release|x64'" />\r
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ICL-Release|x64'" />\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">libcds-$(PlatformName)-vc$(PlatformToolsetVersion)_debug</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ICL-Debug|Win32'">libcds-$(PlatformName)-icl_debug</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugVLD|Win32'">libcds-$(PlatformName)-vc$(PlatformToolsetVersion)_debug</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">libcds-$(PlatformName)-vc$(PlatformToolsetVersion)</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ICL-Release|Win32'">libcds-$(PlatformName)-icl</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">libcds-$(PlatformName)-vc$(PlatformToolsetVersion)_debug</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ICL-Debug|x64'">libcds-$(PlatformName)-icl_debug</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugVLD|x64'">libcds-$(PlatformName)-vc$(PlatformToolsetVersion)_debug</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">libcds-$(Platform)-vc$(PlatformToolsetVersion)</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ICL-Release|x64'">libcds-$(PlatformName)-icl</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">libcds-x86-vc12_debug</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='ICL-Debug|Win32'">libcds-x86-icl_debug</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugVLD|Win32'">libcds-x86-vc12_debug</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">libcds-x86-vc12</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='ICL-Release|Win32'">libcds-x86-icl</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">libcds-amd64-vc12_debug</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='ICL-Debug|x64'">libcds-amd64-icl_debug</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugVLD|x64'">libcds-amd64-vc12_debug</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">libcds-amd64-vc12</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='ICL-Release|x64'">libcds-amd64-icl</TargetName>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
@@ -652,9 +652,11 @@
     <ClInclude Include="..\..\..\cds\compiler\vc\amd64\cxx11_atomic.h" />\r
     <ClInclude Include="..\..\..\cds\compiler\vc\x86\cxx11_atomic.h" />\r
     <ClInclude Include="..\..\..\cds\container\basket_queue.h" />\r
+    <ClInclude Include="..\..\..\cds\container\bronson_avltree_map_rcu.h" />\r
     <ClInclude Include="..\..\..\cds\container\cuckoo_map.h" />\r
     <ClInclude Include="..\..\..\cds\container\cuckoo_set.h" />\r
     <ClInclude Include="..\..\..\cds\container\details\base.h" />\r
+    <ClInclude Include="..\..\..\cds\container\details\bronson_avltree_base.h" />\r
     <ClInclude Include="..\..\..\cds\container\details\cuckoo_base.h" />\r
     <ClInclude Include="..\..\..\cds\container\details\ellen_bintree_base.h" />\r
     <ClInclude Include="..\..\..\cds\container\details\guarded_ptr_cast.h" />\r
@@ -673,6 +675,7 @@
     <ClInclude Include="..\..\..\cds\container\ellen_bintree_set_dhp.h" />\r
     <ClInclude Include="..\..\..\cds\container\ellen_bintree_set_hp.h" />\r
     <ClInclude Include="..\..\..\cds\container\ellen_bintree_set_rcu.h" />\r
+    <ClInclude Include="..\..\..\cds\container\impl\bronson_avltree_map_rcu.h" />\r
     <ClInclude Include="..\..\..\cds\container\impl\ellen_bintree_map.h" />\r
     <ClInclude Include="..\..\..\cds\container\impl\ellen_bintree_set.h" />\r
     <ClInclude Include="..\..\..\cds\container\impl\lazy_kvlist.h" />\r
@@ -709,8 +712,6 @@
     <ClInclude Include="..\..\..\cds\container\striped_map\boost_slist.h" />\r
     <ClInclude Include="..\..\..\cds\container\striped_map\boost_unordered_map.h" />\r
     <ClInclude Include="..\..\..\cds\container\striped_map\std_hash_map.h" />\r
-    <ClInclude Include="..\..\..\cds\container\striped_map\std_hash_map_std.h" />\r
-    <ClInclude Include="..\..\..\cds\container\striped_map\std_hash_map_vc.h" />\r
     <ClInclude Include="..\..\..\cds\container\striped_map\std_list.h" />\r
     <ClInclude Include="..\..\..\cds\container\striped_map\std_map.h" />\r
     <ClInclude Include="..\..\..\cds\container\striped_set.h" />\r
@@ -723,8 +724,6 @@
     <ClInclude Include="..\..\..\cds\container\striped_set\boost_unordered_set.h" />\r
     <ClInclude Include="..\..\..\cds\container\striped_set\boost_vector.h" />\r
     <ClInclude Include="..\..\..\cds\container\striped_set\std_hash_set.h" />\r
-    <ClInclude Include="..\..\..\cds\container\striped_set\std_hash_set_std.h" />\r
-    <ClInclude Include="..\..\..\cds\container\striped_set\std_hash_set_vc.h" />\r
     <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
@@ -743,8 +742,10 @@
     <ClInclude Include="..\..\..\cds\gc\impl\hp_decl.h" />\r
     <ClInclude Include="..\..\..\cds\gc\impl\hp_impl.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\basket_queue.h" />\r
+    <ClInclude Include="..\..\..\cds\intrusive\bronson_avltree_rcu.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\cuckoo_set.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\details\base.h" />\r
+    <ClInclude Include="..\..\..\cds\intrusive\details\bronson_avltree_base.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\details\ellen_bintree_base.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\details\lazy_list_base.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\details\michael_list_base.h" />\r
@@ -792,6 +793,9 @@
     <ClInclude Include="..\..\..\cds\os\osx\topology.h" />\r
     <ClInclude Include="..\..\..\cds\os\posix\fake_topology.h" />\r
     <ClInclude Include="..\..\..\cds\os\posix\timer.h" />\r
+    <ClInclude Include="..\..\..\cds\sync\injected_monitor.h" />\r
+    <ClInclude Include="..\..\..\cds\sync\lock_array.h" />\r
+    <ClInclude Include="..\..\..\cds\sync\spinlock.h" />\r
     <ClInclude Include="..\..\..\cds\threading\details\cxx11.h" />\r
     <ClInclude Include="..\..\..\cds\threading\details\cxx11_manager.h" />\r
     <ClInclude Include="..\..\..\cds\urcu\details\base.h" />\r

diff --git a/projects/Win/vc14/cds.vcxproj.filters b/projects/Win/vc14/cds.vcxproj.filters
index 6b52bf201f1f9ecf7553fcdcfc45ac024f577bb2..3d4a7756762d71632a952d09e738d022ac884ad9 100644 (file)
--- a/projects/Win/vc14/cds.vcxproj.filters
+++ b/projects/Win/vc14/cds.vcxproj.filters
@@ -151,6 +151,9 @@
     <Filter Include="Header Files\cds\gc\impl">\r
       <UniqueIdentifier>{3195cce2-1710-4b79-a1cf-6c7cea085fa3}</UniqueIdentifier>\r
     </Filter>\r
+    <Filter Include="Header Files\cds\sync">\r
+      <UniqueIdentifier>{03d212fb-73f8-4f0e-9aff-f22b0783fee8}</UniqueIdentifier>\r
+    </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="..\..\..\src\dllmain.cpp">\r
@@ -716,12 +719,6 @@
     <ClInclude Include="..\..\..\cds\container\striped_set\std_hash_set.h">\r
       <Filter>Header Files\cds\container\striped_set</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\container\striped_set\std_hash_set_std.h">\r
-      <Filter>Header Files\cds\container\striped_set</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\container\striped_set\std_hash_set_vc.h">\r
-      <Filter>Header Files\cds\container\striped_set</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\..\cds\container\striped_set\std_list.h">\r
       <Filter>Header Files\cds\container\striped_set</Filter>\r
     </ClInclude>\r
@@ -749,12 +746,6 @@
     <ClInclude Include="..\..\..\cds\container\striped_map\std_hash_map.h">\r
       <Filter>Header Files\cds\container\striped_map</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\container\striped_map\std_hash_map_std.h">\r
-      <Filter>Header Files\cds\container\striped_map</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\container\striped_map\std_hash_map_vc.h">\r
-      <Filter>Header Files\cds\container\striped_map</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\..\cds\container\striped_map\std_list.h">\r
       <Filter>Header Files\cds\container\striped_map</Filter>\r
     </ClInclude>\r
@@ -1163,5 +1154,29 @@
     <ClInclude Include="..\..\..\cds\algo\atomic.h">\r
       <Filter>Header Files\cds\algo</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\..\cds\intrusive\details\bronson_avltree_base.h">\r
+      <Filter>Header Files\cds\intrusive\details</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\..\cds\intrusive\bronson_avltree_rcu.h">\r
+      <Filter>Header Files\cds\intrusive</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\..\cds\container\details\bronson_avltree_base.h">\r
+      <Filter>Header Files\cds\container\details</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\..\cds\container\impl\bronson_avltree_map_rcu.h">\r
+      <Filter>Header Files\cds\container\impl</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\..\cds\container\bronson_avltree_map_rcu.h">\r
+      <Filter>Header Files\cds\container</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\..\cds\sync\injected_monitor.h">\r
+      <Filter>Header Files\cds\sync</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\..\cds\sync\spinlock.h">\r
+      <Filter>Header Files\cds\sync</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\..\cds\sync\lock_array.h">\r
+      <Filter>Header Files\cds\sync</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/projects/Win/vc14/hdr-test-striped-set.vcxproj b/projects/Win/vc14/hdr-test-striped-set.vcxproj
index 6640fdf48e3c48d12aeb4c86d7fccef338c0d7ca..15c70e38695aa8f8421e09219c3c7ba5df0f4030 100644 (file)
--- a/projects/Win/vc14/hdr-test-striped-set.vcxproj
+++ b/projects/Win/vc14/hdr-test-striped-set.vcxproj
@@ -70,7 +70,6 @@
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_refinable_hashset_boost_unordered_set.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_refinable_hashset_boost_vector.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_refinable_hashset_hashset_std.cpp" />\r
-    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_refinable_hashset_hashset_vc.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_refinable_hashset_list.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_refinable_hashset_set.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_refinable_hashset_slist.cpp" />\r
@@ -82,7 +81,6 @@
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_striped_hashset_boost_unordered_set.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_striped_hashset_boost_vector.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_striped_hashset_hashset_std.cpp" />\r
-    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_striped_hashset_hashset_vc.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_striped_hashset_list.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_striped_hashset_set.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_striped_hashset_slist.cpp" />\r

diff --git a/projects/Win/vc14/hdr-test-striped-set.vcxproj.filters b/projects/Win/vc14/hdr-test-striped-set.vcxproj.filters
index 9e662789847aab9d7ee3ef143218f52ffdff1d30..80351d37e06840f1ab9e9a464c6b3b0d1c28cd67 100644 (file)
--- a/projects/Win/vc14/hdr-test-striped-set.vcxproj.filters
+++ b/projects/Win/vc14/hdr-test-striped-set.vcxproj.filters
@@ -102,9 +102,6 @@
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_refinable_hashset_hashset_std.cpp">\r
       <Filter>container\striped</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_refinable_hashset_hashset_vc.cpp">\r
-      <Filter>container\striped</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_refinable_hashset_list.cpp">\r
       <Filter>container\striped</Filter>\r
     </ClCompile>\r
@@ -138,9 +135,6 @@
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_striped_hashset_hashset_std.cpp">\r
       <Filter>container\striped</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_striped_hashset_hashset_vc.cpp">\r
-      <Filter>container\striped</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_striped_hashset_list.cpp">\r
       <Filter>container\striped</Filter>\r
     </ClCompile>\r

diff --git a/projects/Win/vc14/unit-map-insdel.vcxproj b/projects/Win/vc14/unit-map-insdel.vcxproj
index 25899930a26cf684164a9522ea3b1378693fd855..2c9f882926673c78fba5b95e5d1bb91e332a63ea 100644 (file)
--- a/projects/Win/vc14/unit-map-insdel.vcxproj
+++ b/projects/Win/vc14/unit-map-insdel.vcxproj
@@ -43,6 +43,7 @@
     </ProjectConfiguration>\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <ClCompile Include="..\..\..\tests\unit\map2\map_insdelfind.cpp" />\r
     <ClCompile Include="..\..\..\tests\unit\map2\map_insdel_func.cpp" />\r
     <ClCompile Include="..\..\..\tests\unit\map2\map_insdel_int.cpp" />\r
     <ClCompile Include="..\..\..\tests\unit\map2\map_insdel_item_int.cpp" />\r

diff --git a/projects/Win/vc14/unit-prerequisites.vcxproj b/projects/Win/vc14/unit-prerequisites.vcxproj
index 98cd1672bae8b3e256131b64b329c471e4f8dfcf..798e031251c400ebeb44c63c91ec4d288609a517 100644 (file)
--- a/projects/Win/vc14/unit-prerequisites.vcxproj
+++ b/projects/Win/vc14/unit-prerequisites.vcxproj
@@ -425,13 +425,13 @@
     <ClCompile Include="..\..\..\tests\cppunit\test_main.cpp">\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='DebugVLD|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ICL-Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ICL-Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='DebugVLD|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ICL-Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ICL-Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ICL-Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ICL-Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
     </ClCompile>\r
     <ClCompile Include="..\..\..\tests\cppunit\thread.cpp" />\r