From 2ff9cf36e70c0061fa0371100e4a84f67a859b3e Mon Sep 17 00:00:00 2001 From: khizmax Date: Sat, 29 Nov 2014 00:06:49 +0300 Subject: [PATCH] VC14 preview compatibility --- cds/algo/backoff_strategy.h | 2 +- projects/Win/vc12/unit-prerequisites.vcxproj | 4 ++++ projects/Win/vc14/cds.vcxproj | 2 -- projects/Win/vc14/cds.vcxproj.filters | 6 ------ projects/Win/vc14/unit-prerequisites.vcxproj | 13 ++++++++++++- 5 files changed, 17 insertions(+), 10 deletions(-) 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 @@ _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) 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 @@ - - 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 @@ Header Files\cds\OS\posix - - Header Files\cds\OS\posix - Header Files\cds\OS\posix @@ -404,9 +401,6 @@ Header Files\cds\OS\win - - Header Files\cds\OS\win - Header Files\cds\OS\win 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 @@ - + + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + -- 2.34.1