X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=projects%2FWin%2Fvc141%2Fgtest-set-split-michael.vcxproj;h=e0e2596da2fd39aefd394d839f5ba124af746598;hb=e24698da9526a66440762b361c017a34eae600d1;hp=6190e2d90f7229bf5d5b8fb3276b8b43d01db477;hpb=6912d51a86c80e0a830a788de0581f524576916c;p=libcds.git
diff --git a/projects/Win/vc141/gtest-set-split-michael.vcxproj b/projects/Win/vc141/gtest-set-split-michael.vcxproj
index 6190e2d9..e0e2596d 100644
--- a/projects/Win/vc141/gtest-set-split-michael.vcxproj
+++ b/projects/Win/vc141/gtest-set-split-michael.vcxproj
@@ -91,7 +91,7 @@
{B54B6B1B-EFCA-413C-BD7C-7A8C8E009717}
Win32Proj
set
- 8.1
+ 10.0.14393.0
@@ -197,7 +197,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
@@ -214,7 +214,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
@@ -231,7 +231,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
@@ -248,7 +248,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
@@ -267,7 +267,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
@@ -288,7 +288,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