Chromium Code Reviews| Index: minidump/minidump_extensions.h |
| diff --git a/minidump/minidump_extensions.h b/minidump/minidump_extensions.h |
| index 8453f5538f5d9c9213420d52524d26f03f4ae1da..35f80a6daf30e5df37ca84ebbcd5811b732cfc20 100644 |
| --- a/minidump/minidump_extensions.h |
| +++ b/minidump/minidump_extensions.h |
| @@ -24,15 +24,12 @@ |
| #include "build/build_config.h" |
| #include "util/misc/uuid.h" |
| -#if defined(COMPILER_MSVC) |
| // C4200 is "nonstandard extension used : zero-sized array in struct/union". |
| // We would like to globally disable this warning, but unfortunately, the |
| // compiler is buggy and only supports disabling it with a pragma, so we can't |
| // disable it with other silly warnings in build/common.gypi. See: |
| // https://connect.microsoft.com/VisualStudio/feedback/details/1114440 |
| -#pragma warning(push) |
| -#pragma warning(disable: 4200) |
| -#endif // COMPILER_MSVC |
| +MSVC_PUSH_DISABLE_WARNING(4200) |
|
Mark Mentovai
2015/02/05 18:24:10
Semicolons?
scottmg
2015/02/05 18:51:43
I think that would result in a stray semicolon at
|
| #if defined(COMPILER_MSVC) |
| #define PACKED |
| @@ -470,9 +467,7 @@ struct ALIGNAS(4) PACKED MinidumpCrashpadInfo { |
| #endif // COMPILER_MSVC |
| #undef PACKED |
| -#if defined(COMPILER_MSVC) |
| -#pragma warning(pop) // C4200 |
| -#endif // COMPILER_MSVC |
| +MSVC_POP_WARNING() // C4200 |
| } // namespace crashpad |