From c38725b70e596457c1c0b1685dd2e017966324d1 Mon Sep 17 00:00:00 2001 From: Nelson Billing Date: Wed, 19 Jun 2019 16:13:24 -0700 Subject: Fix 'debug_file' in PESourceLineWriter. - Add a #define to testing.gyp to avoid warnings about TR1 deprecation. - PESourceLineWriter now reads debug_file from CodeView record instead of using code_file value. - Updated PE-only MD reading unit test. Change-Id: Ib4e6201df3e3fd651e160f310584b5a67b16c842 Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/1668347 Reviewed-by: Ivan Penkov --- src/client/windows/unittests/testing.gyp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/client/windows') diff --git a/src/client/windows/unittests/testing.gyp b/src/client/windows/unittests/testing.gyp index cd8aca22..0f9f944c 100644 --- a/src/client/windows/unittests/testing.gyp +++ b/src/client/windows/unittests/testing.gyp @@ -53,9 +53,9 @@ # Visual C++ implements variadic templates strangely, and # VC++2012 broke Google Test by lowering this value. See # http://stackoverflow.com/questions/12558327/google-test-in-visual-studio-2012 - 'defines': ['_VARIADIC_MAX=10'], + 'defines': ['_VARIADIC_MAX=10', '_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING'], }, - 'defines': ['_VARIADIC_MAX=10'], + 'defines': ['_VARIADIC_MAX=10', '_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING'], }, { 'target_name': 'gmock', @@ -81,9 +81,9 @@ '<(DEPTH)/testing/googlemock', '<(DEPTH)/testing', ], - 'defines': ['_VARIADIC_MAX=10'], + 'defines': ['_VARIADIC_MAX=10', '_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING'], }, - 'defines': ['_VARIADIC_MAX=10'], + 'defines': ['_VARIADIC_MAX=10', '_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING'], }, ], -- cgit v1.2.1