From: khizmax Date: Fri, 22 Sep 2017 14:24:12 +0000 (+0300) Subject: [MSVC] Added /permissive- settings X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e24698da9526a66440762b361c017a34eae600d1;p=libcds.git [MSVC] Added /permissive- settings --- diff --git a/projects/Win/vc141/cds.vcxproj b/projects/Win/vc141/cds.vcxproj index 3eff9021..a6d46895 100644 --- a/projects/Win/vc141/cds.vcxproj +++ b/projects/Win/vc141/cds.vcxproj @@ -30,7 +30,7 @@ {408FE9BC-44F0-4E6A-89FA-D6F952584239} cds Win32Proj - 8.1 + 10.0.14393.0 @@ -148,7 +148,7 @@ - /wd4512 /wd4127 /Zc:inline %(AdditionalOptions) + /wd4512 /wd4127 /Zc:inline /permissive- %(AdditionalOptions) Disabled $(SolutionDir)..\..\..\;$(BOOST_PATH);%(AdditionalIncludeDirectories) _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;CDS_BUILD_LIB;%(PreprocessorDefinitions) @@ -179,7 +179,7 @@ X64 - /wd4512 /wd4127 /Zc:inline %(AdditionalOptions) + /wd4512 /wd4127 /Zc:inline /permissive- %(AdditionalOptions) Disabled $(SolutionDir)..\..\..\;$(BOOST_PATH);%(AdditionalIncludeDirectories) _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;CDS_BUILD_LIB;%(PreprocessorDefinitions) @@ -210,7 +210,7 @@ - /wd4512 /wd4127 /Zc:inline %(AdditionalOptions) + /wd4512 /wd4127 /Zc:inline /permissive- %(AdditionalOptions) Full AnySuitable true @@ -261,7 +261,7 @@ X64 - /wd4512 /wd4127 /Zc:inline %(AdditionalOptions) + /wd4512 /wd4127 /Zc:inline /permissive- %(AdditionalOptions) Full AnySuitable true @@ -309,7 +309,7 @@ - /wd4512 /wd4127 /Zc:inline %(AdditionalOptions) + /wd4512 /wd4127 /Zc:inline /permissive- %(AdditionalOptions) /Zc:inline /permissive- Disabled $(SolutionDir)..\..\..\;$(BOOST_PATH);%(AdditionalIncludeDirectories) _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;CDS_BUILD_LIB;%(PreprocessorDefinitions) @@ -340,7 +340,7 @@ X64 - /wd4512 /wd4127 /Zc:inline %(AdditionalOptions) + /wd4512 /wd4127 /Zc:inline /permissive- %(AdditionalOptions) Disabled $(SolutionDir)..\..\..\;$(BOOST_PATH);%(AdditionalIncludeDirectories) _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;CDS_BUILD_LIB;%(PreprocessorDefinitions) diff --git a/projects/Win/vc141/gtest-deque.vcxproj b/projects/Win/vc141/gtest-deque.vcxproj index 5c7b660e..44c06ea0 100644 --- a/projects/Win/vc141/gtest-deque.vcxproj +++ b/projects/Win/vc141/gtest-deque.vcxproj @@ -34,7 +34,7 @@ {EA5D825A-83A4-4A36-83C1-3D048D21D55B} Win32Proj stack - 8.1 + 10.0.14393.0 @@ -170,6 +170,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -185,6 +186,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -221,6 +223,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/gtest-ilist-iterable.vcxproj b/projects/Win/vc141/gtest-ilist-iterable.vcxproj index 65783854..0c05c89e 100644 --- a/projects/Win/vc141/gtest-ilist-iterable.vcxproj +++ b/projects/Win/vc141/gtest-ilist-iterable.vcxproj @@ -42,7 +42,7 @@ {F28BF36F-3E04-44EF-929C-635CC8A44C0F} Win32Proj intrusive_list - 8.1 + 10.0.14393.0 @@ -149,6 +149,7 @@ _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) 4503 + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -165,6 +166,7 @@ _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) 4503 + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -181,6 +183,7 @@ _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) 4503 + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -197,6 +200,7 @@ _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) 4503 + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -215,6 +219,7 @@ _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) 4503 + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -235,6 +240,7 @@ _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) 4503 + /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/gtest-ilist-lazy.vcxproj b/projects/Win/vc141/gtest-ilist-lazy.vcxproj index 57e202ca..9d44a876 100644 --- a/projects/Win/vc141/gtest-ilist-lazy.vcxproj +++ b/projects/Win/vc141/gtest-ilist-lazy.vcxproj @@ -47,7 +47,7 @@ {549BD562-1EA4-4BFE-945D-A398947B527B} Win32Proj intrusive_list - 8.1 + 10.0.14393.0 @@ -154,6 +154,7 @@ _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) 4503 + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -170,6 +171,7 @@ _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) 4503 + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -186,6 +188,7 @@ _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) 4503 + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -202,6 +205,7 @@ _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) 4503 + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -220,6 +224,7 @@ _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) 4503 + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -240,6 +245,7 @@ _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) 4503 + /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/gtest-ilist-michael.vcxproj b/projects/Win/vc141/gtest-ilist-michael.vcxproj index 65961111..7a11c63e 100644 --- a/projects/Win/vc141/gtest-ilist-michael.vcxproj +++ b/projects/Win/vc141/gtest-ilist-michael.vcxproj @@ -47,7 +47,7 @@ {AD892D1A-CF4D-4B04-BAC9-10ECDD902D0E} Win32Proj intrusive_list - 8.1 + 10.0.14393.0 @@ -154,6 +154,7 @@ _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) 4503 + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -170,6 +171,7 @@ _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) 4503 + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -186,6 +188,7 @@ _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) 4503 + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -202,6 +205,7 @@ _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) 4503 + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -220,6 +224,7 @@ _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) 4503 + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -240,6 +245,7 @@ _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) 4503 + /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/gtest-iset-feldman.vcxproj b/projects/Win/vc141/gtest-iset-feldman.vcxproj index eff17395..c0316ccd 100644 --- a/projects/Win/vc141/gtest-iset-feldman.vcxproj +++ b/projects/Win/vc141/gtest-iset-feldman.vcxproj @@ -51,7 +51,7 @@ {4B5B03A0-2534-43B5-92CA-3F9B7B9898E6} Win32Proj intrusive_set - 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 %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) 4503 @@ -174,7 +174,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 @@ -191,7 +191,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 @@ -208,7 +208,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 @@ -227,7 +227,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 @@ -248,7 +248,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 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 diff --git a/projects/Win/vc141/gtest-iset-michael-lazy.vcxproj b/projects/Win/vc141/gtest-iset-michael-lazy.vcxproj index bbe06128..9eba5447 100644 --- a/projects/Win/vc141/gtest-iset-michael-lazy.vcxproj +++ b/projects/Win/vc141/gtest-iset-michael-lazy.vcxproj @@ -61,7 +61,7 @@ {174B2F0B-8D0E-4072-BED2-FFB5765B175D} Win32Proj intrusive_set - 8.1 + 10.0.14393.0 @@ -167,7 +167,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 @@ -184,7 +184,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 @@ -201,7 +201,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 @@ -218,7 +218,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 @@ -237,7 +237,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 @@ -258,7 +258,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 diff --git a/projects/Win/vc141/gtest-iset-michael.vcxproj b/projects/Win/vc141/gtest-iset-michael.vcxproj index 661b1502..871e1ad2 100644 --- a/projects/Win/vc141/gtest-iset-michael.vcxproj +++ b/projects/Win/vc141/gtest-iset-michael.vcxproj @@ -61,7 +61,7 @@ {6E296FE3-5730-4422-9782-4723ABD1DBCD} Win32Proj intrusive_set - 8.1 + 10.0.14393.0 @@ -167,7 +167,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 @@ -184,7 +184,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 @@ -201,7 +201,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 @@ -218,7 +218,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 @@ -237,7 +237,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 @@ -258,7 +258,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 diff --git a/projects/Win/vc141/gtest-iset-skip.vcxproj b/projects/Win/vc141/gtest-iset-skip.vcxproj index 245c7227..f5066524 100644 --- a/projects/Win/vc141/gtest-iset-skip.vcxproj +++ b/projects/Win/vc141/gtest-iset-skip.vcxproj @@ -54,7 +54,7 @@ {04522047-CCD4-4E27-97B9-26DE6C0A2677} Win32Proj intrusive_set - 8.1 + 10.0.14393.0 @@ -160,7 +160,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 @@ -177,7 +177,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 @@ -194,7 +194,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 @@ -211,7 +211,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 @@ -230,7 +230,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 @@ -251,7 +251,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 diff --git a/projects/Win/vc141/gtest-iset-split-iterable.vcxproj b/projects/Win/vc141/gtest-iset-split-iterable.vcxproj index b3236b4b..cb664176 100644 --- a/projects/Win/vc141/gtest-iset-split-iterable.vcxproj +++ b/projects/Win/vc141/gtest-iset-split-iterable.vcxproj @@ -41,7 +41,7 @@ {ACA14BAB-40E5-4507-B9CA-CF62503D8781} 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 diff --git a/projects/Win/vc141/gtest-iset-split-lazy.vcxproj b/projects/Win/vc141/gtest-iset-split-lazy.vcxproj index 4bfcdb57..dc559d55 100644 --- a/projects/Win/vc141/gtest-iset-split-lazy.vcxproj +++ b/projects/Win/vc141/gtest-iset-split-lazy.vcxproj @@ -89,7 +89,7 @@ {25B31807-E27E-4644-8CB4-4B7C32E47B0E} 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 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 diff --git a/projects/Win/vc141/gtest-list-iterable.vcxproj b/projects/Win/vc141/gtest-list-iterable.vcxproj index fbd33a0a..8540d5cd 100644 --- a/projects/Win/vc141/gtest-list-iterable.vcxproj +++ b/projects/Win/vc141/gtest-list-iterable.vcxproj @@ -47,7 +47,7 @@ {A1020E07-FEF9-4017-BA19-51A57FE9D2E6} Win32Proj list - 8.1 + 10.0.14393.0 @@ -153,6 +153,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -168,6 +169,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -183,6 +185,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -198,6 +201,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -215,6 +219,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -234,6 +239,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/gtest-list-lazy.vcxproj b/projects/Win/vc141/gtest-list-lazy.vcxproj index 347d53bd..872ff3bf 100644 --- a/projects/Win/vc141/gtest-list-lazy.vcxproj +++ b/projects/Win/vc141/gtest-list-lazy.vcxproj @@ -73,7 +73,7 @@ {3C43C24C-45B9-4388-BBE2-D6521A4BB1D4} Win32Proj list - 8.1 + 10.0.14393.0 @@ -179,6 +179,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -194,6 +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 /Zc:inline /permissive- %(AdditionalOptions) Console @@ -209,6 +211,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -224,6 +227,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -241,6 +245,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -260,6 +265,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/gtest-list-michael.vcxproj b/projects/Win/vc141/gtest-list-michael.vcxproj index d4651c36..1a914775 100644 --- a/projects/Win/vc141/gtest-list-michael.vcxproj +++ b/projects/Win/vc141/gtest-list-michael.vcxproj @@ -87,7 +87,7 @@ {123BD9AB-D988-499F-BAC5-E6490697567C} Win32Proj list - 8.1 + 10.0.14393.0 @@ -193,6 +193,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -208,6 +209,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -223,6 +225,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -238,6 +241,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -255,6 +259,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -274,6 +279,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/gtest-map-feldman.vcxproj b/projects/Win/vc141/gtest-map-feldman.vcxproj index fdbb37b2..ed36537e 100644 --- a/projects/Win/vc141/gtest-map-feldman.vcxproj +++ b/projects/Win/vc141/gtest-map-feldman.vcxproj @@ -48,7 +48,7 @@ {F6B51C66-CFFF-495F-8012-5D5DD5BC8A48} Win32Proj map_feldman - 8.1 + 10.0.14393.0 @@ -154,7 +154,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 @@ -171,7 +171,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 @@ -188,7 +188,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 @@ -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 %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) 4503 @@ -224,7 +224,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 @@ -245,7 +245,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 diff --git a/projects/Win/vc141/gtest-map-michael-iterable.vcxproj b/projects/Win/vc141/gtest-map-michael-iterable.vcxproj index 14640d25..e24dc6aa 100644 --- a/projects/Win/vc141/gtest-map-michael-iterable.vcxproj +++ b/projects/Win/vc141/gtest-map-michael-iterable.vcxproj @@ -44,7 +44,7 @@ {DA761FE3-BA12-4DC5-983E-F14F16442E0D} Win32Proj map_michael_iterable - 8.1 + 10.0.14393.0 @@ -150,7 +150,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 @@ -167,7 +167,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 @@ -184,7 +184,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 @@ -201,7 +201,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 @@ -220,7 +220,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 @@ -241,7 +241,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 diff --git a/projects/Win/vc141/gtest-map-michael-lazy.vcxproj b/projects/Win/vc141/gtest-map-michael-lazy.vcxproj index b07d653b..b24ee2dd 100644 --- a/projects/Win/vc141/gtest-map-michael-lazy.vcxproj +++ b/projects/Win/vc141/gtest-map-michael-lazy.vcxproj @@ -55,7 +55,7 @@ {9C029822-F10B-4906-94B0-EB2E261B196C} Win32Proj map_michael_lazy - 8.1 + 10.0.14393.0 @@ -161,7 +161,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 @@ -178,7 +178,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 @@ -195,7 +195,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 @@ -212,7 +212,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 @@ -231,7 +231,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 @@ -252,7 +252,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 diff --git a/projects/Win/vc141/gtest-map-michael.vcxproj b/projects/Win/vc141/gtest-map-michael.vcxproj index 614031a1..bf7f18d4 100644 --- a/projects/Win/vc141/gtest-map-michael.vcxproj +++ b/projects/Win/vc141/gtest-map-michael.vcxproj @@ -62,7 +62,7 @@ {32B5098A-D846-4964-A1A7-CDE98808BFBF} Win32Proj map_michael - 8.1 + 10.0.14393.0 @@ -168,7 +168,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 @@ -185,7 +185,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 @@ -202,7 +202,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 @@ -219,7 +219,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 @@ -238,7 +238,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 @@ -259,7 +259,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 diff --git a/projects/Win/vc141/gtest-map-skip.vcxproj b/projects/Win/vc141/gtest-map-skip.vcxproj index b2305a9d..425cc9cf 100644 --- a/projects/Win/vc141/gtest-map-skip.vcxproj +++ b/projects/Win/vc141/gtest-map-skip.vcxproj @@ -65,7 +65,7 @@ {F10B5D8F-3B5D-4961-8D3F-001F17AE997D} Win32Proj map_skip - 8.1 + 10.0.14393.0 @@ -171,7 +171,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 @@ -188,7 +188,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 @@ -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 %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) 4503 @@ -222,7 +222,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 @@ -241,7 +241,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 @@ -262,7 +262,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 diff --git a/projects/Win/vc141/gtest-map-split-iterable.vcxproj b/projects/Win/vc141/gtest-map-split-iterable.vcxproj index d86db63e..c580d83f 100644 --- a/projects/Win/vc141/gtest-map-split-iterable.vcxproj +++ b/projects/Win/vc141/gtest-map-split-iterable.vcxproj @@ -40,7 +40,7 @@ {B7C62D31-ED28-4D85-AA01-D1071E870080} Win32Proj map_split - 8.1 + 10.0.14393.0 @@ -146,7 +146,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 @@ -163,7 +163,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 @@ -180,7 +180,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 @@ -197,7 +197,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 @@ -216,7 +216,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 @@ -237,7 +237,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 diff --git a/projects/Win/vc141/gtest-map-split-lazy.vcxproj b/projects/Win/vc141/gtest-map-split-lazy.vcxproj index 3f7d2268..63c70482 100644 --- a/projects/Win/vc141/gtest-map-split-lazy.vcxproj +++ b/projects/Win/vc141/gtest-map-split-lazy.vcxproj @@ -90,7 +90,7 @@ {4CC95A65-049E-4622-9B23-5D9F493F112D} Win32Proj map_split - 8.1 + 10.0.14393.0 @@ -196,7 +196,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 @@ -213,7 +213,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 @@ -230,7 +230,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 @@ -247,7 +247,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 @@ -266,7 +266,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 @@ -287,7 +287,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 diff --git a/projects/Win/vc141/gtest-map-split-michael.vcxproj b/projects/Win/vc141/gtest-map-split-michael.vcxproj index 494609fb..28d0d7f6 100644 --- a/projects/Win/vc141/gtest-map-split-michael.vcxproj +++ b/projects/Win/vc141/gtest-map-split-michael.vcxproj @@ -90,7 +90,7 @@ {534CFF3F-827F-4781-858B-F5097AB87755} Win32Proj map_split - 8.1 + 10.0.14393.0 @@ -196,7 +196,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 @@ -213,7 +213,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 @@ -230,7 +230,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 @@ -247,7 +247,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 @@ -266,7 +266,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 @@ -287,7 +287,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 diff --git a/projects/Win/vc141/gtest-misc.vcxproj b/projects/Win/vc141/gtest-misc.vcxproj index c227dcd4..7cc0670c 100644 --- a/projects/Win/vc141/gtest-misc.vcxproj +++ b/projects/Win/vc141/gtest-misc.vcxproj @@ -52,7 +52,7 @@ {FA22E700-1AE5-4d7b-B9F1-0A919FF7FF06} Win32Proj misc - 8.1 + 10.0.14393.0 @@ -158,6 +158,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -173,6 +174,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -188,6 +190,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -203,6 +206,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -220,6 +224,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -239,6 +244,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/gtest-pqueue.vcxproj b/projects/Win/vc141/gtest-pqueue.vcxproj index 68d195ae..adb3a4ee 100644 --- a/projects/Win/vc141/gtest-pqueue.vcxproj +++ b/projects/Win/vc141/gtest-pqueue.vcxproj @@ -42,7 +42,7 @@ {ED94B1D1-2442-43C2-A71C-A757122408A6} Win32Proj stack - 8.1 + 10.0.14393.0 @@ -148,6 +148,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -163,6 +164,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -178,6 +180,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -193,6 +196,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -210,6 +214,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -229,6 +234,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/gtest-queue.vcxproj b/projects/Win/vc141/gtest-queue.vcxproj index 6a1efb9f..59ca1656 100644 --- a/projects/Win/vc141/gtest-queue.vcxproj +++ b/projects/Win/vc141/gtest-queue.vcxproj @@ -69,7 +69,7 @@ {9EB8FAB6-78E8-48B6-9589-85985CE8D33D} Win32Proj stack - 8.1 + 10.0.14393.0 @@ -175,6 +175,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -190,6 +191,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -205,6 +207,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -220,6 +223,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -237,6 +241,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -256,6 +261,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/gtest-set-feldman.vcxproj b/projects/Win/vc141/gtest-set-feldman.vcxproj index f82d1f4b..ab75318d 100644 --- a/projects/Win/vc141/gtest-set-feldman.vcxproj +++ b/projects/Win/vc141/gtest-set-feldman.vcxproj @@ -50,7 +50,7 @@ {E58CE34B-BDFB-4867-BFC0-35F61118AD12} Win32Proj set - 8.1 + 10.0.14393.0 @@ -156,7 +156,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 @@ -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 %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) 4503 @@ -190,7 +190,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 @@ -207,7 +207,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 @@ -226,7 +226,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 @@ -247,7 +247,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 diff --git a/projects/Win/vc141/gtest-set-michael-iterable.vcxproj b/projects/Win/vc141/gtest-set-michael-iterable.vcxproj index ac06bb63..1835a2a7 100644 --- a/projects/Win/vc141/gtest-set-michael-iterable.vcxproj +++ b/projects/Win/vc141/gtest-set-michael-iterable.vcxproj @@ -45,7 +45,7 @@ {F4801F77-A195-475D-9330-83E004DE1A56} Win32Proj set - 8.1 + 10.0.14393.0 @@ -151,7 +151,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 @@ -168,7 +168,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 @@ -185,7 +185,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 @@ -202,7 +202,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 @@ -221,7 +221,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 @@ -242,7 +242,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 diff --git a/projects/Win/vc141/gtest-set-michael-lazy.vcxproj b/projects/Win/vc141/gtest-set-michael-lazy.vcxproj index 76b7e05e..45e433bd 100644 --- a/projects/Win/vc141/gtest-set-michael-lazy.vcxproj +++ b/projects/Win/vc141/gtest-set-michael-lazy.vcxproj @@ -63,7 +63,7 @@ {254D5C75-6DA4-455E-84DA-8005A18155D9} Win32Proj set - 8.1 + 10.0.14393.0 @@ -169,7 +169,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 @@ -186,7 +186,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 @@ -203,7 +203,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 @@ -220,7 +220,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 @@ -239,7 +239,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 @@ -260,7 +260,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 diff --git a/projects/Win/vc141/gtest-set-michael.vcxproj b/projects/Win/vc141/gtest-set-michael.vcxproj index a4092ea0..22ee59d8 100644 --- a/projects/Win/vc141/gtest-set-michael.vcxproj +++ b/projects/Win/vc141/gtest-set-michael.vcxproj @@ -63,7 +63,7 @@ {0FF8CE32-2FF8-4791-92C0-ED25FAAE140D} Win32Proj set - 8.1 + 10.0.14393.0 @@ -169,7 +169,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 @@ -186,7 +186,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 @@ -203,7 +203,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 @@ -220,7 +220,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 @@ -239,7 +239,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 @@ -260,7 +260,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 diff --git a/projects/Win/vc141/gtest-set-skip.vcxproj b/projects/Win/vc141/gtest-set-skip.vcxproj index 5847f87b..210ec426 100644 --- a/projects/Win/vc141/gtest-set-skip.vcxproj +++ b/projects/Win/vc141/gtest-set-skip.vcxproj @@ -64,7 +64,7 @@ {0841A7B2-E580-4DCA-8E37-58DE4DC48B64} Win32Proj set - 8.1 + 10.0.14393.0 @@ -170,7 +170,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 @@ -187,7 +187,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 @@ -204,7 +204,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 @@ -221,7 +221,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 @@ -240,7 +240,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 @@ -261,7 +261,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 diff --git a/projects/Win/vc141/gtest-set-split-iterable.vcxproj b/projects/Win/vc141/gtest-set-split-iterable.vcxproj index 709c92ea..8ffa42aa 100644 --- a/projects/Win/vc141/gtest-set-split-iterable.vcxproj +++ b/projects/Win/vc141/gtest-set-split-iterable.vcxproj @@ -40,7 +40,7 @@ {093B83D9-9B04-4BF5-9048-B6F81D559872} Win32Proj set - 8.1 + 10.0.14393.0 @@ -146,7 +146,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 @@ -163,7 +163,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 @@ -180,7 +180,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 @@ -197,7 +197,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 @@ -216,7 +216,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 @@ -237,7 +237,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 diff --git a/projects/Win/vc141/gtest-set-split-lazy.vcxproj b/projects/Win/vc141/gtest-set-split-lazy.vcxproj index e2c72f26..86a178d7 100644 --- a/projects/Win/vc141/gtest-set-split-lazy.vcxproj +++ b/projects/Win/vc141/gtest-set-split-lazy.vcxproj @@ -91,7 +91,7 @@ {3AF2EF79-7DDC-46C9-89BB-C7D56615A479} 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 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 diff --git a/projects/Win/vc141/gtest-stack.vcxproj b/projects/Win/vc141/gtest-stack.vcxproj index 54a54e22..58044232 100644 --- a/projects/Win/vc141/gtest-stack.vcxproj +++ b/projects/Win/vc141/gtest-stack.vcxproj @@ -43,7 +43,7 @@ {5407E9D2-67D9-4266-976E-7A90BDE2541D} Win32Proj stack - 8.1 + 10.0.14393.0 @@ -149,6 +149,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -164,6 +165,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -179,6 +181,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -194,6 +197,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -211,6 +215,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console @@ -230,6 +235,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/gtest-striped-map-boost.vcxproj b/projects/Win/vc141/gtest-striped-map-boost.vcxproj index 1f315e80..3836bd36 100644 --- a/projects/Win/vc141/gtest-striped-map-boost.vcxproj +++ b/projects/Win/vc141/gtest-striped-map-boost.vcxproj @@ -43,7 +43,7 @@ {32E3E2E1-1953-44FD-AAE2-19BD8D030CAB} Win32Proj striped-map - 8.1 + 10.0.14393.0 @@ -149,7 +149,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 @@ -165,7 +165,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 @@ -181,7 +181,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 @@ -197,7 +197,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 @@ -215,7 +215,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 @@ -235,7 +235,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 diff --git a/projects/Win/vc141/gtest-striped-map-cuckoo.vcxproj b/projects/Win/vc141/gtest-striped-map-cuckoo.vcxproj index a6d75fe5..591befd7 100644 --- a/projects/Win/vc141/gtest-striped-map-cuckoo.vcxproj +++ b/projects/Win/vc141/gtest-striped-map-cuckoo.vcxproj @@ -52,7 +52,7 @@ {B032E27A-D7C4-437C-AC10-D235C20130F8} Win32Proj striped-map - 8.1 + 10.0.14393.0 @@ -158,7 +158,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 @@ -174,7 +174,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 @@ -190,7 +190,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 @@ -206,7 +206,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 @@ -224,7 +224,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 @@ -244,7 +244,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 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 diff --git a/projects/Win/vc141/gtest-striped-set-boost.vcxproj b/projects/Win/vc141/gtest-striped-set-boost.vcxproj index 2147ab03..421b5979 100644 --- a/projects/Win/vc141/gtest-striped-set-boost.vcxproj +++ b/projects/Win/vc141/gtest-striped-set-boost.vcxproj @@ -54,7 +54,7 @@ {F7A98219-FA54-4CEA-9813-5873A6676D3C} Win32Proj striped-set - 8.1 + 10.0.14393.0 @@ -160,7 +160,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 @@ -176,7 +176,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 @@ -192,7 +192,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 @@ -208,7 +208,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 @@ -226,7 +226,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 @@ -246,7 +246,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 diff --git a/projects/Win/vc141/gtest-striped-set-cuckoo.vcxproj b/projects/Win/vc141/gtest-striped-set-cuckoo.vcxproj index c6581e23..26e74cf3 100644 --- a/projects/Win/vc141/gtest-striped-set-cuckoo.vcxproj +++ b/projects/Win/vc141/gtest-striped-set-cuckoo.vcxproj @@ -61,7 +61,7 @@ {E6C84E07-A02C-4F91-B759-6CA4730F4534} Win32Proj striped-set - 8.1 + 10.0.14393.0 @@ -167,7 +167,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 @@ -183,7 +183,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 @@ -199,7 +199,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 @@ -215,7 +215,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 @@ -233,7 +233,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 @@ -253,7 +253,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 diff --git a/projects/Win/vc141/gtest-striped-set-std.vcxproj b/projects/Win/vc141/gtest-striped-set-std.vcxproj index 22881c62..662b6701 100644 --- a/projects/Win/vc141/gtest-striped-set-std.vcxproj +++ b/projects/Win/vc141/gtest-striped-set-std.vcxproj @@ -41,7 +41,7 @@ {BC6BCA1F-3850-4571-ADE2-BB11C2B68807} Win32Proj striped-set - 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 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 diff --git a/projects/Win/vc141/gtest-tree-ellen.vcxproj b/projects/Win/vc141/gtest-tree-ellen.vcxproj index 62c58de7..33aef667 100644 --- a/projects/Win/vc141/gtest-tree-ellen.vcxproj +++ b/projects/Win/vc141/gtest-tree-ellen.vcxproj @@ -131,7 +131,7 @@ {93F1FE35-2EF4-4193-B8A2-54988F61F3B8} Win32Proj tree - 8.1 + 10.0.14393.0 @@ -240,7 +240,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 @@ -256,7 +256,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 @@ -272,7 +272,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 @@ -288,7 +288,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 @@ -306,7 +306,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 @@ -326,7 +326,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 diff --git a/projects/Win/vc141/stress-framework.vcxproj b/projects/Win/vc141/stress-framework.vcxproj index 765b29b0..5cc1a02a 100644 --- a/projects/Win/vc141/stress-framework.vcxproj +++ b/projects/Win/vc141/stress-framework.vcxproj @@ -84,7 +84,7 @@ {A34CED07-A442-4FA1-81C4-F8B9CD3C832B} Win32Proj stack - 8.1 + 10.0.14393.0 @@ -190,6 +190,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -205,6 +206,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -220,6 +222,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -235,6 +238,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -252,6 +256,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -271,6 +276,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/stress-freelist.vcxproj b/projects/Win/vc141/stress-freelist.vcxproj index 6c1124f0..87e3aa8c 100644 --- a/projects/Win/vc141/stress-freelist.vcxproj +++ b/projects/Win/vc141/stress-freelist.vcxproj @@ -35,7 +35,7 @@ {79A6845E-85BF-4000-94FF-9DF2473460D4} Win32Proj stress_freelist - 8.1 + 10.0.14393.0 stress-freelist @@ -142,6 +142,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -157,6 +158,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -172,6 +174,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -187,6 +190,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -204,6 +208,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -223,6 +228,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/stress-map-del3.vcxproj b/projects/Win/vc141/stress-map-del3.vcxproj index 41002a31..5196134d 100644 --- a/projects/Win/vc141/stress-map-del3.vcxproj +++ b/projects/Win/vc141/stress-map-del3.vcxproj @@ -61,7 +61,7 @@ {729E28BB-F36F-4462-8434-9C252C286525} Win32Proj stress_map_del3 - 8.1 + 10.0.14393.0 stress-map-del3 @@ -168,7 +168,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -184,7 +184,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -200,7 +200,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -216,7 +216,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -234,7 +234,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -254,7 +254,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/stress-map-delodd.vcxproj b/projects/Win/vc141/stress-map-delodd.vcxproj index 88c07562..10bda61a 100644 --- a/projects/Win/vc141/stress-map-delodd.vcxproj +++ b/projects/Win/vc141/stress-map-delodd.vcxproj @@ -61,7 +61,7 @@ {DD432BE7-0CA8-47C6-B861-943A036C18EF} Win32Proj stress_map_delodd - 8.1 + 10.0.14393.0 stress-map-delodd @@ -168,7 +168,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -184,7 +184,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -200,7 +200,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -216,7 +216,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -234,7 +234,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -254,7 +254,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/stress-map-find_string.vcxproj b/projects/Win/vc141/stress-map-find_string.vcxproj index 20ecef85..e673d8ac 100644 --- a/projects/Win/vc141/stress-map-find_string.vcxproj +++ b/projects/Win/vc141/stress-map-find_string.vcxproj @@ -77,7 +77,7 @@ {C127CD80-E8A7-47E4-B7EC-1709D2188982} Win32Proj stress_map_find_string - 8.1 + 10.0.14393.0 stress-map-find_string @@ -184,7 +184,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -200,7 +200,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -216,7 +216,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -232,7 +232,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -250,7 +250,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -270,7 +270,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/stress-map-insdel-func.vcxproj b/projects/Win/vc141/stress-map-insdel-func.vcxproj index 369cc856..603cff5d 100644 --- a/projects/Win/vc141/stress-map-insdel-func.vcxproj +++ b/projects/Win/vc141/stress-map-insdel-func.vcxproj @@ -62,7 +62,7 @@ {34FA4110-F17B-4AD0-A4C9-C91B92AD06E4} Win32Proj stress_map_insdel_func - 8.1 + 10.0.14393.0 stress-map-insdel-func @@ -169,7 +169,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -185,7 +185,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -201,7 +201,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -217,7 +217,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -235,7 +235,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -255,7 +255,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/stress-map-insdel-item-int.vcxproj b/projects/Win/vc141/stress-map-insdel-item-int.vcxproj index 0bfc31b5..b0fac538 100644 --- a/projects/Win/vc141/stress-map-insdel-item-int.vcxproj +++ b/projects/Win/vc141/stress-map-insdel-item-int.vcxproj @@ -62,7 +62,7 @@ {50387CA5-F5B2-4C40-ACFD-FC3C9EE2CD6B} Win32Proj stress_map_insdel_item_int - 8.1 + 10.0.14393.0 stress-map-insdel-item-int @@ -169,7 +169,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -185,7 +185,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -201,7 +201,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -217,7 +217,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -235,7 +235,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -255,7 +255,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/stress-map-insdel-string.vcxproj b/projects/Win/vc141/stress-map-insdel-string.vcxproj index 5bc191e0..b554c83d 100644 --- a/projects/Win/vc141/stress-map-insdel-string.vcxproj +++ b/projects/Win/vc141/stress-map-insdel-string.vcxproj @@ -70,7 +70,7 @@ {2D0E651D-058D-4D69-9A44-12149E6CA5BE} Win32Proj stress_map_insdel_string - 8.1 + 10.0.14393.0 stress-map-insdel-string @@ -177,7 +177,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -193,7 +193,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -209,7 +209,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -225,7 +225,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -243,7 +243,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -263,7 +263,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/stress-map-insdelfind.vcxproj b/projects/Win/vc141/stress-map-insdelfind.vcxproj index 77b5311e..9c7d0f98 100644 --- a/projects/Win/vc141/stress-map-insdelfind.vcxproj +++ b/projects/Win/vc141/stress-map-insdelfind.vcxproj @@ -68,7 +68,7 @@ {1BB746AC-7856-4E59-9430-51177621DC35} Win32Proj stress_map_insdelfind - 8.1 + 10.0.14393.0 stress-map-insdelfind @@ -175,7 +175,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -191,7 +191,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -207,7 +207,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -223,7 +223,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -241,7 +241,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -261,7 +261,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/stress-map-iter-erase.vcxproj b/projects/Win/vc141/stress-map-iter-erase.vcxproj index a1ab8ab1..b957bab1 100644 --- a/projects/Win/vc141/stress-map-iter-erase.vcxproj +++ b/projects/Win/vc141/stress-map-iter-erase.vcxproj @@ -43,7 +43,7 @@ {48B8CA78-E7A9-4666-976B-2B87F58B7906} Win32Proj stress_map_iter_erase - 8.1 + 10.0.14393.0 stress-map-iter-erase @@ -150,7 +150,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -166,7 +166,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -182,7 +182,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -198,7 +198,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -216,7 +216,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -236,7 +236,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/stress-map-minmax.vcxproj b/projects/Win/vc141/stress-map-minmax.vcxproj index 79d46f95..30ba7188 100644 --- a/projects/Win/vc141/stress-map-minmax.vcxproj +++ b/projects/Win/vc141/stress-map-minmax.vcxproj @@ -43,7 +43,7 @@ {A0BC5155-F91B-4F89-B775-BB09A54EDB73} Win32Proj stress_map_minmax - 8.1 + 10.0.14393.0 stress-map-minmax @@ -150,7 +150,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -166,7 +166,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -182,7 +182,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -198,7 +198,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -216,7 +216,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -236,7 +236,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/stress-pqueue.vcxproj b/projects/Win/vc141/stress-pqueue.vcxproj index 8af491ea..eb51f04c 100644 --- a/projects/Win/vc141/stress-pqueue.vcxproj +++ b/projects/Win/vc141/stress-pqueue.vcxproj @@ -47,7 +47,7 @@ {51AC349E-B365-4FCF-8778-17A1534E4584} Win32Proj stress_pqueue - 8.1 + 10.0.14393.0 stress-pqueue @@ -154,6 +154,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -169,6 +170,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -184,6 +186,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -199,6 +202,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -216,6 +220,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -235,6 +240,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/stress-queue-bounded.vcxproj b/projects/Win/vc141/stress-queue-bounded.vcxproj index 4d104ac0..192b30da 100644 --- a/projects/Win/vc141/stress-queue-bounded.vcxproj +++ b/projects/Win/vc141/stress-queue-bounded.vcxproj @@ -39,7 +39,7 @@ {9AACAF12-6B3F-4625-BB24-50A4F4252C84} Win32Proj stress_queue_bounded - 8.1 + 10.0.14393.0 stress-queue-bounded @@ -146,6 +146,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -161,6 +162,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -176,6 +178,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -191,6 +194,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -208,6 +212,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -227,6 +232,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/stress-queue-pop.vcxproj b/projects/Win/vc141/stress-queue-pop.vcxproj index db3ef16e..f2f40999 100644 --- a/projects/Win/vc141/stress-queue-pop.vcxproj +++ b/projects/Win/vc141/stress-queue-pop.vcxproj @@ -47,7 +47,7 @@ {C9768906-A083-4648-9701-C67D33D7C219} Win32Proj stress_queue_pop - 8.1 + 10.0.14393.0 stress-queue-pop @@ -154,6 +154,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -169,6 +170,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -184,6 +186,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -199,6 +202,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -216,6 +220,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -235,6 +240,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/stress-queue-push.vcxproj b/projects/Win/vc141/stress-queue-push.vcxproj index 23abb0cf..64d9f663 100644 --- a/projects/Win/vc141/stress-queue-push.vcxproj +++ b/projects/Win/vc141/stress-queue-push.vcxproj @@ -47,7 +47,7 @@ {47B9F1F9-C9F1-4F25-842B-EE8E6447FE50} Win32Proj stress_queue_push - 8.1 + 10.0.14393.0 stress-queue-push @@ -154,6 +154,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -169,6 +170,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -184,6 +186,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -199,6 +202,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -216,6 +220,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -235,6 +240,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/stress-queue-pushpop.vcxproj b/projects/Win/vc141/stress-queue-pushpop.vcxproj index c9993bb8..5bb386fc 100644 --- a/projects/Win/vc141/stress-queue-pushpop.vcxproj +++ b/projects/Win/vc141/stress-queue-pushpop.vcxproj @@ -48,7 +48,7 @@ {EACBF8EC-C58F-4CC8-9435-21BE9812287A} Win32Proj stress_queue_pushpop - 8.1 + 10.0.14393.0 stress-queue-pushpop @@ -155,6 +155,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -170,6 +171,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -185,6 +187,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -200,6 +203,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -217,6 +221,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -236,6 +241,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/stress-queue-random.vcxproj b/projects/Win/vc141/stress-queue-random.vcxproj index b765fc43..9dc4dc21 100644 --- a/projects/Win/vc141/stress-queue-random.vcxproj +++ b/projects/Win/vc141/stress-queue-random.vcxproj @@ -47,7 +47,7 @@ {E845EB69-9335-4A03-93D0-6D6AC48462E5} Win32Proj stress_queue_random - 8.1 + 10.0.14393.0 stress-queue-random @@ -154,6 +154,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -169,6 +170,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -184,6 +186,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -199,6 +202,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -216,6 +220,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -235,6 +240,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/stress-set-del3.vcxproj b/projects/Win/vc141/stress-set-del3.vcxproj index 00761695..e72dc09e 100644 --- a/projects/Win/vc141/stress-set-del3.vcxproj +++ b/projects/Win/vc141/stress-set-del3.vcxproj @@ -60,7 +60,7 @@ {E91A1938-BB89-4676-9C9F-69AA697CB488} Win32Proj stress_set_del3 - 8.1 + 10.0.14393.0 stress-set-del3 @@ -167,7 +167,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -183,7 +183,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -199,7 +199,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -215,7 +215,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -233,7 +233,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -253,7 +253,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/stress-set-delodd.vcxproj b/projects/Win/vc141/stress-set-delodd.vcxproj index cdaaa9da..f28b98f3 100644 --- a/projects/Win/vc141/stress-set-delodd.vcxproj +++ b/projects/Win/vc141/stress-set-delodd.vcxproj @@ -63,7 +63,7 @@ {8202D428-1E08-4744-B372-6B2E83A9928E} Win32Proj stress_set_delodd - 8.1 + 10.0.14393.0 stress-set-delodd @@ -170,7 +170,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -186,7 +186,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -202,7 +202,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -218,7 +218,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -236,7 +236,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -256,7 +256,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/stress-set-insdel_func.vcxproj b/projects/Win/vc141/stress-set-insdel_func.vcxproj index f45db0a8..2870b020 100644 --- a/projects/Win/vc141/stress-set-insdel_func.vcxproj +++ b/projects/Win/vc141/stress-set-insdel_func.vcxproj @@ -61,7 +61,7 @@ {EE7A269E-83E4-402B-9C79-85058826E81E} Win32Proj stress_set_insdel_func - 8.1 + 10.0.14393.0 stress-set-insdel-func @@ -168,7 +168,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -184,7 +184,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -200,7 +200,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -216,7 +216,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -234,7 +234,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -254,7 +254,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/stress-set-insdel_string.vcxproj b/projects/Win/vc141/stress-set-insdel_string.vcxproj index dbb81bb8..c44a0c13 100644 --- a/projects/Win/vc141/stress-set-insdel_string.vcxproj +++ b/projects/Win/vc141/stress-set-insdel_string.vcxproj @@ -69,7 +69,7 @@ {937D82C6-92AB-4C58-ACE8-F88E7063BFA9} Win32Proj stress_set_insdel_string - 8.1 + 10.0.14393.0 stress-set-insdel-string @@ -176,7 +176,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -192,7 +192,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -208,7 +208,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -224,7 +224,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -242,7 +242,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -262,7 +262,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/stress-set-insdelfind.vcxproj b/projects/Win/vc141/stress-set-insdelfind.vcxproj index d50dce8c..5dc86070 100644 --- a/projects/Win/vc141/stress-set-insdelfind.vcxproj +++ b/projects/Win/vc141/stress-set-insdelfind.vcxproj @@ -70,7 +70,7 @@ {133D1AEE-3BAF-42D1-B1AB-93D5239F4926} Win32Proj stress_set_insdelfind - 8.1 + 10.0.14393.0 stress-set-insdelfind @@ -177,7 +177,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -193,7 +193,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -209,7 +209,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_SCL_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -225,7 +225,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_SCL_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -243,7 +243,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -263,7 +263,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_SCL_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/stress-set-iter-erase.vcxproj b/projects/Win/vc141/stress-set-iter-erase.vcxproj index d9c25593..89024564 100644 --- a/projects/Win/vc141/stress-set-iter-erase.vcxproj +++ b/projects/Win/vc141/stress-set-iter-erase.vcxproj @@ -43,7 +43,7 @@ {A717715D-CA08-4111-8A0E-B69A6DE3FF38} Win32Proj stress_set_iter_erase - 8.1 + 10.0.14393.0 stress-set-iter-erase @@ -150,7 +150,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -166,7 +166,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -182,7 +182,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -198,7 +198,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -216,7 +216,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -236,7 +236,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/stress-set-iteration.vcxproj b/projects/Win/vc141/stress-set-iteration.vcxproj index 8cab9784..d0b85fe6 100644 --- a/projects/Win/vc141/stress-set-iteration.vcxproj +++ b/projects/Win/vc141/stress-set-iteration.vcxproj @@ -43,7 +43,7 @@ {31952FA8-A303-4A0B-94C4-ABA5A8A6DBCE} Win32Proj stress_set_iteration - 8.1 + 10.0.14393.0 stress-set-iteration @@ -150,7 +150,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -166,7 +166,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -182,7 +182,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -198,7 +198,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -216,7 +216,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -236,7 +236,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\set;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/stress-spsc-queue.vcxproj b/projects/Win/vc141/stress-spsc-queue.vcxproj index 6b7c8318..0acb85e3 100644 --- a/projects/Win/vc141/stress-spsc-queue.vcxproj +++ b/projects/Win/vc141/stress-spsc-queue.vcxproj @@ -40,7 +40,7 @@ {CDC54B7B-B882-4CC8-87A2-E237D0D945B2} Win32Proj stress_spsc_queue - 8.1 + 10.0.14393.0 stress-spsc-queue @@ -147,6 +147,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -162,6 +163,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -177,6 +179,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -192,6 +195,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -209,6 +213,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -228,6 +233,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console diff --git a/projects/Win/vc141/stress-stack.vcxproj b/projects/Win/vc141/stress-stack.vcxproj index b5e269af..8dbdc3f4 100644 --- a/projects/Win/vc141/stress-stack.vcxproj +++ b/projects/Win/vc141/stress-stack.vcxproj @@ -42,7 +42,7 @@ {5E1C3684-9463-4A98-BAFC-9BD51F179BB6} Win32Proj stress_stack_pushpop - 8.1 + 10.0.14393.0 stress-stack @@ -149,6 +149,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -164,6 +165,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -179,6 +181,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -194,6 +197,7 @@ Disabled _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -211,6 +215,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console @@ -230,6 +235,7 @@ true _ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj /Zc:inline /permissive- %(AdditionalOptions) Console