X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=projects%2FWin%2Fvc141%2Fgtest-tree-bronson.vcxproj;h=c33597ee73ec28cc1eb22298549df7d2433d6ef6;hb=e24698da9526a66440762b361c017a34eae600d1;hp=d3854489b617476615b0709752cdf483e1b3c638;hpb=7dfac7ccae1aa24f28655e3380293dc1f67ea7b2;p=libcds.git
diff --git a/projects/Win/vc141/gtest-tree-bronson.vcxproj b/projects/Win/vc141/gtest-tree-bronson.vcxproj
index d3854489..c33597ee 100644
--- a/projects/Win/vc141/gtest-tree-bronson.vcxproj
+++ b/projects/Win/vc141/gtest-tree-bronson.vcxproj
@@ -48,7 +48,7 @@
{27AB018B-953E-4632-B6A9-A4E9782A81BA}
Win32Proj
tree
- 8.1
+ 10.0.14393.0
@@ -157,7 +157,7 @@
Disabled
_ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
$(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories)
- /bigobj /Bv %(AdditionalOptions)
+ /bigobj /Bv %(AdditionalOptions) /Zc:inline /permissive-
Console
@@ -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 /Bv %(AdditionalOptions)
+ /bigobj /Bv %(AdditionalOptions) /Zc:inline /permissive-
Console
@@ -189,7 +189,7 @@
Disabled
_ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
$(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories)
- /bigobj /Bv %(AdditionalOptions)
+ /bigobj /Bv %(AdditionalOptions) /Zc:inline /permissive-
Console
@@ -205,7 +205,7 @@
Disabled
_ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
$(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories)
- /bigobj /Bv %(AdditionalOptions)
+ /bigobj /Bv %(AdditionalOptions) /Zc:inline /permissive-
Console
@@ -223,7 +223,7 @@
true
_ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
$(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories)
- /bigobj /Bv %(AdditionalOptions)
+ /bigobj /Bv %(AdditionalOptions) /Zc:inline /permissive-
Console
@@ -243,7 +243,7 @@
true
_ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
$(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories)
- /bigobj /Bv %(AdditionalOptions)
+ /bigobj /Bv %(AdditionalOptions) /Zc:inline /permissive-
Console