From: khizmax <libcds.dev@gmail.com>
Date: Fri, 28 Nov 2014 21:06:49 +0000 (+0300)
Subject: VC14 preview compatibility
X-Git-Tag: v2.0.0~45
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=commitdiff_plain;h=2ff9cf36e70c0061fa0371100e4a84f67a859b3e

VC14 preview compatibility
---

diff --git a/cds/algo/backoff_strategy.h b/cds/algo/backoff_strategy.h
index 75f43e34..8b02d1ba 100644
--- a/cds/algo/backoff_strategy.h
+++ b/cds/algo/backoff_strategy.h
@@ -216,7 +216,7 @@ namespace cds {
         public:
             typedef SpinBkoff  spin_backoff    ;   ///< spin back-off strategy
             typedef YieldBkoff yield_backoff   ;   ///< yield back-off strategy
-            typedef Tag         impl_tag        ;   ///< implementation separation tag
+            typedef Tag        impl_tag        ;   ///< implementation separation tag
 
             static size_t s_nExpMin ;   ///< Default minimum spinning bound (16)
             static size_t s_nExpMax ;   ///< Default maximum spinning bound (16384)
diff --git a/projects/Win/vc12/unit-prerequisites.vcxproj b/projects/Win/vc12/unit-prerequisites.vcxproj
index 3890ae73..4389e393 100644
--- a/projects/Win/vc12/unit-prerequisites.vcxproj
+++ b/projects/Win/vc12/unit-prerequisites.vcxproj
@@ -430,6 +430,10 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='DebugVLD|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ICL-Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ICL-Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ICL-Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\..\tests\cppunit\thread.cpp" />
   </ItemGroup>
diff --git a/projects/Win/vc14/cds.vcxproj b/projects/Win/vc14/cds.vcxproj
index 59f6fbdc..a2a18d1d 100644
--- a/projects/Win/vc14/cds.vcxproj
+++ b/projects/Win/vc14/cds.vcxproj
@@ -880,13 +880,11 @@
     <ClInclude Include="..\..\..\cds\os\linux\timer.h" />
     <ClInclude Include="..\..\..\cds\os\linux\topology.h" />
     <ClInclude Include="..\..\..\cds\os\posix\alloc_aligned.h" />
-    <ClInclude Include="..\..\..\cds\os\posix\syserror.h" />
     <ClInclude Include="..\..\..\cds\os\posix\thread.h" />
     <ClInclude Include="..\..\..\cds\os\sunos\alloc_aligned.h" />
     <ClInclude Include="..\..\..\cds\os\sunos\timer.h" />
     <ClInclude Include="..\..\..\cds\os\sunos\topology.h" />
     <ClInclude Include="..\..\..\cds\os\win\alloc_aligned.h" />
-    <ClInclude Include="..\..\..\cds\os\win\syserror.h" />
     <ClInclude Include="..\..\..\cds\os\win\thread.h" />
     <ClInclude Include="..\..\..\cds\os\win\timer.h" />
     <ClInclude Include="..\..\..\cds\os\win\topology.h" />
diff --git a/projects/Win/vc14/cds.vcxproj.filters b/projects/Win/vc14/cds.vcxproj.filters
index 0fcc08e7..732a2ae5 100644
--- a/projects/Win/vc14/cds.vcxproj.filters
+++ b/projects/Win/vc14/cds.vcxproj.filters
@@ -386,9 +386,6 @@
     <ClInclude Include="..\..\..\cds\os\posix\alloc_aligned.h">
       <Filter>Header Files\cds\OS\posix</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\os\posix\syserror.h">
-      <Filter>Header Files\cds\OS\posix</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\os\posix\thread.h">
       <Filter>Header Files\cds\OS\posix</Filter>
     </ClInclude>
@@ -404,9 +401,6 @@
     <ClInclude Include="..\..\..\cds\os\win\alloc_aligned.h">
       <Filter>Header Files\cds\OS\win</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\os\win\syserror.h">
-      <Filter>Header Files\cds\OS\win</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\os\win\thread.h">
       <Filter>Header Files\cds\OS\win</Filter>
     </ClInclude>
diff --git a/projects/Win/vc14/unit-prerequisites.vcxproj b/projects/Win/vc14/unit-prerequisites.vcxproj
index b7a4ab2f..98cd1672 100644
--- a/projects/Win/vc14/unit-prerequisites.vcxproj
+++ b/projects/Win/vc14/unit-prerequisites.vcxproj
@@ -422,7 +422,18 @@
   <ItemGroup>
     <ClCompile Include="..\..\..\tests\unit\ellen_bintree_update_desc_pool.cpp" />
     <ClCompile Include="..\..\..\tests\unit\michael_alloc.cpp" />
-    <ClCompile Include="..\..\..\tests\cppunit\test_main.cpp" />
+    <ClCompile Include="..\..\..\tests\cppunit\test_main.cpp">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='DebugVLD|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ICL-Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ICL-Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='DebugVLD|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ICL-Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ICL-Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
     <ClCompile Include="..\..\..\tests\cppunit\thread.cpp" />
   </ItemGroup>
   <ItemGroup>