X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=projects%2FWin%2Fvc141%2Fgtest-striped-map-std.vcxproj;h=4141b410284868c2378c819d8aa9291d7494a192;hb=e24698da9526a66440762b361c017a34eae600d1;hp=a65922a2a40c413290f621c7527225931710261b;hpb=7dfac7ccae1aa24f28655e3380293dc1f67ea7b2;p=libcds.git
diff --git a/projects/Win/vc141/gtest-striped-map-std.vcxproj b/projects/Win/vc141/gtest-striped-map-std.vcxproj
index a65922a2..4141b410 100644
--- a/projects/Win/vc141/gtest-striped-map-std.vcxproj
+++ b/projects/Win/vc141/gtest-striped-map-std.vcxproj
@@ -41,7 +41,7 @@
{7D43117B-CB6A-44D2-A79B-6E035CD8FA04}
Win32Proj
striped-map
- 8.1
+ 10.0.14393.0
@@ -147,7 +147,7 @@
Disabled
_ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
$(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories)
- /bigobj %(AdditionalOptions)
+ /bigobj %(AdditionalOptions) /Zc:inline /permissive-
Console
@@ -163,7 +163,7 @@
Disabled
_ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
$(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories)
- /bigobj %(AdditionalOptions)
+ /bigobj %(AdditionalOptions) /Zc:inline /permissive-
Console
@@ -179,7 +179,7 @@
Disabled
_ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
$(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories)
- /bigobj %(AdditionalOptions)
+ /bigobj %(AdditionalOptions) /Zc:inline /permissive-
Console
@@ -195,7 +195,7 @@
Disabled
_ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
$(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories)
- /bigobj %(AdditionalOptions)
+ /bigobj %(AdditionalOptions) /Zc:inline /permissive-
Console
@@ -213,7 +213,7 @@
true
_ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
$(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories)
- /bigobj %(AdditionalOptions)
+ /bigobj %(AdditionalOptions) /Zc:inline /permissive-
Console
@@ -233,7 +233,7 @@
true
_ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
$(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories)
- /bigobj %(AdditionalOptions)
+ /bigobj %(AdditionalOptions) /Zc:inline /permissive-
Console