X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=projects%2FWin%2Fvc141%2Fgtest-set-feldman.vcxproj;h=ab75318ddb4d240bad728abefd36a4c67acf54ba;hb=e24698da9526a66440762b361c017a34eae600d1;hp=f82d1f4b8d44972bd1b3c4ff9b7e295987eea38b;hpb=7dfac7ccae1aa24f28655e3380293dc1f67ea7b2;p=libcds.git
diff --git a/projects/Win/vc141/gtest-set-feldman.vcxproj b/projects/Win/vc141/gtest-set-feldman.vcxproj
index f82d1f4b..ab75318d 100644
--- a/projects/Win/vc141/gtest-set-feldman.vcxproj
+++ b/projects/Win/vc141/gtest-set-feldman.vcxproj
@@ -50,7 +50,7 @@
{E58CE34B-BDFB-4867-BFC0-35F61118AD12}
Win32Proj
set
- 8.1
+ 10.0.14393.0
@@ -156,7 +156,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
@@ -173,7 +173,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
@@ -190,7 +190,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
@@ -207,7 +207,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
@@ -226,7 +226,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
@@ -247,7 +247,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