X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=blobdiff_plain;f=projects%2FWin%2Fvc141%2Fgtest-iset-split-michael.vcxproj;h=8d487d10dced239daec321b0f49c0911dde9c12e;hp=21a7bd10fc4bfa7aebaf8f61a89c219acbc4b58f;hb=e24698da9526a66440762b361c017a34eae600d1;hpb=7dfac7ccae1aa24f28655e3380293dc1f67ea7b2
diff --git a/projects/Win/vc141/gtest-iset-split-michael.vcxproj b/projects/Win/vc141/gtest-iset-split-michael.vcxproj
index 21a7bd10..8d487d10 100644
--- a/projects/Win/vc141/gtest-iset-split-michael.vcxproj
+++ b/projects/Win/vc141/gtest-iset-split-michael.vcxproj
@@ -89,7 +89,7 @@
{60B84B21-741E-45F5-86FB-A2ECBD05782E}
Win32Proj
intrusive_set
- 8.1
+ 10.0.14393.0
@@ -195,7 +195,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
@@ -212,7 +212,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
@@ -229,7 +229,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
@@ -246,7 +246,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
@@ -265,7 +265,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
@@ -286,7 +286,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