Index: minidump/minidump_context_writer.cc |
diff --git a/minidump/minidump_context_writer.cc b/minidump/minidump_context_writer.cc |
index 70aa96b8e0dd19f9e3b858a5d8b13a69ba52ae10..888e068478ed9d1bfdcce7ef9fe0e3ffc5cae6bb 100644 |
--- a/minidump/minidump_context_writer.cc |
+++ b/minidump/minidump_context_writer.cc |
@@ -39,16 +39,8 @@ scoped_ptr<MinidumpContextWriter> MinidumpContextWriter::CreateFromSnapshot( |
} |
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 in
Mark Mentovai
2015/02/05 18:24:10
scottmg wrote:
scottmg
2015/02/05 18:51:42
Done.
|
context.reset(context_amd64); |
context_amd64->InitializeFromSnapshot(context_snapshot->x86_64); |
break; |