VC14 preview compatibility

diff --git a/cds/algo/backoff_strategy.h b/cds/algo/backoff_strategy.h
index 75f43e347f28c3a0666283032946f4cf108838fb..8b02d1bac43d4f1b670419bdfc33b19308c20710 100644 (file)
--- 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 3890ae73ae3cd9c3c14bc59f416c945f9fe11c3f..4389e3931db2931b92cd893f201d28745a054cb8 100644 (file)
--- 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>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='DebugVLD|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
   </ItemGroup>\r

diff --git a/projects/Win/vc14/cds.vcxproj b/projects/Win/vc14/cds.vcxproj
index 59f6fbdc8743218624ced389ffcc367d917b912b..a2a18d1dd351ce46631d00c8451fff0f6e449ad6 100644 (file)
--- a/projects/Win/vc14/cds.vcxproj
+++ b/projects/Win/vc14/cds.vcxproj
@@ -880,13 +880,11 @@
     <ClInclude Include="..\..\..\cds\os\linux\timer.h" />\r
     <ClInclude Include="..\..\..\cds\os\linux\topology.h" />\r
     <ClInclude Include="..\..\..\cds\os\posix\alloc_aligned.h" />\r
-    <ClInclude Include="..\..\..\cds\os\posix\syserror.h" />\r
     <ClInclude Include="..\..\..\cds\os\posix\thread.h" />\r
     <ClInclude Include="..\..\..\cds\os\sunos\alloc_aligned.h" />\r
     <ClInclude Include="..\..\..\cds\os\sunos\timer.h" />\r
     <ClInclude Include="..\..\..\cds\os\sunos\topology.h" />\r
     <ClInclude Include="..\..\..\cds\os\win\alloc_aligned.h" />\r
-    <ClInclude Include="..\..\..\cds\os\win\syserror.h" />\r
     <ClInclude Include="..\..\..\cds\os\win\thread.h" />\r
     <ClInclude Include="..\..\..\cds\os\win\timer.h" />\r
     <ClInclude Include="..\..\..\cds\os\win\topology.h" />\r

diff --git a/projects/Win/vc14/cds.vcxproj.filters b/projects/Win/vc14/cds.vcxproj.filters
index 0fcc08e724a7a93e2a2e366d031ef0bc19ae3234..732a2ae5a0eac5269d276079c7f9979c71b43021 100644 (file)
--- 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">\r
       <Filter>Header Files\cds\OS\posix</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\os\posix\syserror.h">\r
-      <Filter>Header Files\cds\OS\posix</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\..\cds\os\posix\thread.h">\r
       <Filter>Header Files\cds\OS\posix</Filter>\r
     </ClInclude>\r
@@ -404,9 +401,6 @@
     <ClInclude Include="..\..\..\cds\os\win\alloc_aligned.h">\r
       <Filter>Header Files\cds\OS\win</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\os\win\syserror.h">\r
-      <Filter>Header Files\cds\OS\win</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\..\cds\os\win\thread.h">\r
       <Filter>Header Files\cds\OS\win</Filter>\r
     </ClInclude>\r

diff --git a/projects/Win/vc14/unit-prerequisites.vcxproj b/projects/Win/vc14/unit-prerequisites.vcxproj
index b7a4ab2f52d1e83f3874cc81597ff8b2ee151cb6..98cd1672bae8b3e256131b64b329c471e4f8dfcf 100644 (file)
--- a/projects/Win/vc14/unit-prerequisites.vcxproj
+++ b/projects/Win/vc14/unit-prerequisites.vcxproj
@@ -422,7 +422,18 @@
   <ItemGroup>\r
     <ClCompile Include="..\..\..\tests\unit\ellen_bintree_update_desc_pool.cpp" />\r
     <ClCompile Include="..\..\..\tests\unit\michael_alloc.cpp" />\r
-    <ClCompile Include="..\..\..\tests\cppunit\test_main.cpp" />\r
+    <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)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+    </ClCompile>\r
     <ClCompile Include="..\..\..\tests\cppunit\thread.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r