Use recently imported MSVC warning macros

minidump/minidump_context_writer.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 21 matching lines @@
 
   switch (context_snapshot->architecture) {
     case kCPUArchitectureX86: {
       MinidumpContextX86Writer* context_x86 = new MinidumpContextX86Writer();
       context.reset(context_x86);
       context_x86->InitializeFromSnapshot(context_snapshot->x86);
       break;
     }
 
     case kCPUArchitectureX86_64: {
-#if defined(COMPILER_MSVC) && defined(ARCH_CPU_X86)
-#pragma warning(push)
-#pragma warning(disable: 4316)  // Object allocated on the heap may not be 16
-                                // byte aligned.
-#endif
       MinidumpContextAMD64Writer* context_amd64 =
-          new MinidumpContextAMD64Writer();
-#if defined(COMPILER_MSVC) && defined(ARCH_CPU_X86)
-#pragma warning(pop)
-#endif
+          MSVC_SUPPRESS_WARNING(4316) new MinidumpContextAMD64Writer();

[scottmg, 2015/02/05 18:03:14]

This one is tricky. Putting it above line 42 is insufficient.

As-is this also disables the warning for line 44.

So the most correct location would be preceding "MinidumpContextAMD64Writer*
..." as a prefix, but that looked a bit ugly.

[Mark Mentovai, 2015/02/05 18:24:10]

scottmg wrote:
PUSH/POP may still be better since this is so sensitive to placement.

[scottmg, 2015/02/05 18:51:42]

Done.

       context.reset(context_amd64);
       context_amd64->InitializeFromSnapshot(context_snapshot->x86_64);
       break;
     }
 
     default: {
       LOG(ERROR) << "unknown context architecture "
                  << context_snapshot->architecture;
       break;
     }
@@ skipping 149 matching lines @@
   return file_writer->Write(&context_, sizeof(context_));
 }
 
 size_t MinidumpContextAMD64Writer::ContextSize() const {
   DCHECK_GE(state(), kStateFrozen);
 
   return sizeof(context_);
 }
 
 }  // namespace crashpad