Chromium Code Reviews| Index: minidump/minidump_file_writer_test.cc |
| diff --git a/minidump/minidump_file_writer_test.cc b/minidump/minidump_file_writer_test.cc |
| index 48931c31736785e571720c6757d6e46de3a847cb..fd880f6e097af6d50bfc4924207e2df9e4ea1be2 100644 |
| --- a/minidump/minidump_file_writer_test.cc |
| +++ b/minidump/minidump_file_writer_test.cc |
| @@ -241,7 +241,7 @@ TEST(MinidumpFileWriter, ZeroLengthStream) { |
| TEST(MinidumpFileWriter, InitializeFromSnapshot_Basic) { |
| const uint32_t kSnapshotTime = 0x4976043c; |
| - const timeval kSnapshotTimeval = { implicit_cast<time_t>(kSnapshotTime), 0 }; |
| + const timeval kSnapshotTimeval = { static_cast<time_t>(kSnapshotTime), 0 }; |
| TestProcessSnapshot process_snapshot; |
| process_snapshot.SetSnapshotTime(kSnapshotTimeval); |
| @@ -287,8 +287,15 @@ 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. |
|
Mark Mentovai
2015/02/05 14:24:32
If this comes up in many more places, perhaps we s
|
| +#endif // OS_WIN && ARCH_CPU_X86 |
| const uint32_t kSnapshotTime = 0xfd469ab8; |
| - const timeval kSnapshotTimeval = { implicit_cast<time_t>(kSnapshotTime), 0 }; |
| + 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); |
| @@ -352,7 +359,7 @@ TEST(MinidumpFileWriter, InitializeFromSnapshot_Exception) { |
| TEST(MinidumpFileWriter, InitializeFromSnapshot_CrashpadInfo) { |
| const uint32_t kSnapshotTime = 0x15393bd3; |
| - const timeval kSnapshotTimeval = { implicit_cast<time_t>(kSnapshotTime), 0 }; |
| + const timeval kSnapshotTimeval = { static_cast<time_t>(kSnapshotTime), 0 }; |
| TestProcessSnapshot process_snapshot; |
| process_snapshot.SetSnapshotTime(kSnapshotTimeval); |