X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=projects%2FWin%2Fvc141%2Fgtest-set-michael.vcxproj;h=22ee59d83535eae57b492fbb9e4574999641d2ff;hb=e24698da9526a66440762b361c017a34eae600d1;hp=ed217da949ad7188333322db71d1dc3e67a070c7;hpb=afa511c186573c60565b7383845335de4752a3ed;p=libcds.git
diff --git a/projects/Win/vc141/gtest-set-michael.vcxproj b/projects/Win/vc141/gtest-set-michael.vcxproj
index ed217da9..22ee59d8 100644
--- a/projects/Win/vc141/gtest-set-michael.vcxproj
+++ b/projects/Win/vc141/gtest-set-michael.vcxproj
@@ -49,7 +49,6 @@
4503
-
@@ -64,7 +63,7 @@
{0FF8CE32-2FF8-4791-92C0-ED25FAAE140D}
Win32Proj
set
- 8.1
+ 10.0.14393.0
@@ -170,7 +169,7 @@
Disabled
_ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
$(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories)
- /bigobj %(AdditionalOptions)
+ /bigobj /Zc:inline /permissive- %(AdditionalOptions)
4503
@@ -187,7 +186,7 @@
Disabled
_ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
$(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories)
- /bigobj %(AdditionalOptions)
+ /bigobj /Zc:inline /permissive- %(AdditionalOptions)
4503
@@ -204,7 +203,7 @@
Disabled
_ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
$(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories)
- /bigobj %(AdditionalOptions)
+ /bigobj /Zc:inline /permissive- %(AdditionalOptions)
4503
@@ -221,7 +220,7 @@
Disabled
_ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
$(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories)
- /bigobj %(AdditionalOptions)
+ /bigobj /Zc:inline /permissive- %(AdditionalOptions)
4503
@@ -240,7 +239,7 @@
true
_ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
$(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories)
- /bigobj %(AdditionalOptions)
+ /bigobj /Zc:inline /permissive- %(AdditionalOptions)
4503
@@ -261,7 +260,7 @@
true
_ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
$(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories)
- /bigobj %(AdditionalOptions)
+ /bigobj /Zc:inline /permissive- %(AdditionalOptions)
4503