X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=blobdiff_plain;f=projects%2FWin%2Fvc141%2Fgtest-iset-michael-iterable.vcxproj;h=e19fbd51dbca84eabd07e1fd39021b40f0d616d3;hp=1d1073ab5fe8a763415c5577fffb9176ec8d21b9;hb=e24698da9526a66440762b361c017a34eae600d1;hpb=65f7355b1eaa63b1a46d2172d10d45e400e6d862
diff --git a/projects/Win/vc141/gtest-iset-michael-iterable.vcxproj b/projects/Win/vc141/gtest-iset-michael-iterable.vcxproj
index 1d1073ab..e19fbd51 100644
--- a/projects/Win/vc141/gtest-iset-michael-iterable.vcxproj
+++ b/projects/Win/vc141/gtest-iset-michael-iterable.vcxproj
@@ -41,7 +41,7 @@
{2A3D25FA-16AB-4105-9585-EF5266979989}
Win32Proj
intrusive_set
- 8.1
+ 10.0.14393.0
@@ -147,7 +147,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
@@ -164,7 +164,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
@@ -181,7 +181,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
@@ -198,7 +198,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
@@ -217,7 +217,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
@@ -238,7 +238,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