Skip to content

Commit 810acb7

Browse files
author
Steve Salas
committed
Squashed 'dotnet-tracer/' changes from 6bbc7c6f2..a5c7d3336
a5c7d3336 suppress warning from googletest git-subtree-dir: dotnet-tracer git-subtree-split: a5c7d33362a5e7cc1e17a1c6f4afa0c656a1d87e
1 parent b068316 commit 810acb7

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

main/OpenCover.Test.Profiler/OpenCover.Test.Profiler.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
<PrecompiledHeader>Use</PrecompiledHeader>
103103
<WarningLevel>Level3</WarningLevel>
104104
<Optimization>Disabled</Optimization>
105-
<PreprocessorDefinitions>TEST_FRAMEWORK;WIN32;_WINDOWS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_VARIADIC_MAX=10</PreprocessorDefinitions>
105+
<PreprocessorDefinitions>TEST_FRAMEWORK;WIN32;_WINDOWS;_DEBUG;_CONSOLE;_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING;%(PreprocessorDefinitions);_VARIADIC_MAX=10</PreprocessorDefinitions>
106106
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
107107
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
108108
<AdditionalIncludeDirectories>..\..\tools\gmock-1.7.0;..\..\tools\gmock-1.7.0\include;..\..\tools\gmock-1.7.0\gtest;..\..\tools\gmock-1.7.0\gtest\include;..\OpenCover.Profiler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -123,7 +123,7 @@
123123
<PrecompiledHeader>Use</PrecompiledHeader>
124124
<WarningLevel>Level3</WarningLevel>
125125
<Optimization>Disabled</Optimization>
126-
<PreprocessorDefinitions>TEST_FRAMEWORK;WIN32;_WINDOWS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_VARIADIC_MAX=10</PreprocessorDefinitions>
126+
<PreprocessorDefinitions>TEST_FRAMEWORK;WIN32;_WINDOWS;_DEBUG;_CONSOLE;_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING;%(PreprocessorDefinitions);_VARIADIC_MAX=10</PreprocessorDefinitions>
127127
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
128128
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
129129
<AdditionalIncludeDirectories>..\..\tools\gmock-1.7.0;..\..\tools\gmock-1.7.0\include;..\..\tools\gmock-1.7.0\gtest;..\..\tools\gmock-1.7.0\gtest\include;..\OpenCover.Profiler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -146,7 +146,7 @@
146146
<Optimization>MaxSpeed</Optimization>
147147
<FunctionLevelLinking>true</FunctionLevelLinking>
148148
<IntrinsicFunctions>true</IntrinsicFunctions>
149-
<PreprocessorDefinitions>TEST_FRAMEWORK;WIN32;_WINDOWS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_VARIADIC_MAX=10</PreprocessorDefinitions>
149+
<PreprocessorDefinitions>TEST_FRAMEWORK;WIN32;_WINDOWS;NDEBUG;_CONSOLE;_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING;%(PreprocessorDefinitions);_VARIADIC_MAX=10</PreprocessorDefinitions>
150150
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
151151
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
152152
<AdditionalIncludeDirectories>..\..\tools\gmock-1.7.0;..\..\tools\gmock-1.7.0\include;..\..\tools\gmock-1.7.0\gtest;..\..\tools\gmock-1.7.0\gtest\include;..\OpenCover.Profiler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -168,7 +168,7 @@
168168
<Optimization>MaxSpeed</Optimization>
169169
<FunctionLevelLinking>true</FunctionLevelLinking>
170170
<IntrinsicFunctions>true</IntrinsicFunctions>
171-
<PreprocessorDefinitions>TEST_FRAMEWORK;WIN32;_WINDOWS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_VARIADIC_MAX=10</PreprocessorDefinitions>
171+
<PreprocessorDefinitions>TEST_FRAMEWORK;WIN32;_WINDOWS;NDEBUG;_CONSOLE;_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING;%(PreprocessorDefinitions);_VARIADIC_MAX=10</PreprocessorDefinitions>
172172
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
173173
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
174174
<AdditionalIncludeDirectories>..\..\tools\gmock-1.7.0;..\..\tools\gmock-1.7.0\include;..\..\tools\gmock-1.7.0\gtest;..\..\tools\gmock-1.7.0\gtest\include;..\OpenCover.Profiler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

0 commit comments

Comments
 (0)