diff options
| author | Nelson Billing <nbilling@google.com> | 2019-06-19 16:13:24 -0700 |
|---|---|---|
| committer | Nelson Billing <nbilling@google.com> | 2019-06-19 23:16:50 +0000 |
| commit | c38725b70e596457c1c0b1685dd2e017966324d1 (patch) | |
| tree | f5fe587f53eb394cd63127c6177e6a9a471d5a74 /src/client/windows | |
| parent | Fix symbol converter after PE-only MD refactor. (diff) | |
| download | breakpad-c38725b70e596457c1c0b1685dd2e017966324d1.tar.xz | |
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 <ivanpe@chromium.org>
Diffstat (limited to 'src/client/windows')
| -rw-r--r-- | src/client/windows/unittests/testing.gyp | 8 |
1 files changed, 4 insertions, 4 deletions
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'], }, ], |