Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Unified Diff: minidump/minidump_file_writer_test.cc

Issue 898133002: Use recently imported MSVC warning macros (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: more iwyu Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « minidump/minidump_extensions.h ('k') | minidump/minidump_thread_writer_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: minidump/minidump_file_writer_test.cc
diff --git a/minidump/minidump_file_writer_test.cc b/minidump/minidump_file_writer_test.cc
index fd880f6e097af6d50bfc4924207e2df9e4ea1be2..7b08a090a5b675e7dd67b057d8a923160aba9f41 100644
--- a/minidump/minidump_file_writer_test.cc
+++ b/minidump/minidump_file_writer_test.cc
@@ -20,6 +20,7 @@
#include <string>
#include "base/basictypes.h"
+#include "base/compiler_specific.h"
#include "gtest/gtest.h"
#include "minidump/minidump_stream_writer.h"
#include "minidump/minidump_writable.h"
@@ -287,15 +288,9 @@ TEST(MinidumpFileWriter, InitializeFromSnapshot_Basic) {
TEST(MinidumpFileWriter, InitializeFromSnapshot_Exception) {
// In a 32-bit environment, this will give a “timestamp out of range” warning,
// but the test should complete without failure.
-#if defined(OS_WIN) && defined(ARCH_CPU_X86)
-#pragma warning(push)
-#pragma warning(disable: 4309) // Truncation of constant value.
-#endif // OS_WIN && ARCH_CPU_X86
const uint32_t kSnapshotTime = 0xfd469ab8;
+ MSVC_SUPPRESS_WARNING(4309); // Truncation of constant value.
const timeval kSnapshotTimeval = { static_cast<time_t>(kSnapshotTime), 0 };
-#if defined(OS_WIN) && defined(ARCH_CPU_X86)
-#pragma warning(pop)
-#endif // OS_WIN && ARCH_CPU_X86
TestProcessSnapshot process_snapshot;
process_snapshot.SetSnapshotTime(kSnapshotTimeval);
« no previous file with comments | « minidump/minidump_extensions.h ('k') | minidump/minidump_thread_writer_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698