From 80c6ab7b99bcbd7b940f78dc0cac52c30249f59c Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Mon, 4 Jun 2018 20:22:08 +0000 Subject: Convert (void) to static_cast in C++ code Converting instances of old C-style void casts to suppress return values to use C++ style static cases. There are a few examples of (void) that remain, since they are in C code, and the third_party/ instances are not touched at all. Change-Id: I72b3fc0e1d713db669b76135e03d1cf87873a2fe Reviewed-on: https://pdfium-review.googlesource.com/33790 Reviewed-by: Henrique Nakashima Commit-Queue: Ryan Harrison --- core/fxcrt/fx_memory_unittest.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'core/fxcrt') diff --git a/core/fxcrt/fx_memory_unittest.cpp b/core/fxcrt/fx_memory_unittest.cpp index 2856bb9592..d062885f85 100644 --- a/core/fxcrt/fx_memory_unittest.cpp +++ b/core/fxcrt/fx_memory_unittest.cpp @@ -21,11 +21,12 @@ const size_t kOverflowIntAlloc2D = kMaxIntAlloc / kWidth + 10; // TODO(tsepez): re-enable OOM tests if we can find a way to // prevent it from hosing the bots. TEST(fxcrt, DISABLED_FX_AllocOOM) { - EXPECT_DEATH_IF_SUPPORTED((void)FX_Alloc(int, kMaxIntAlloc), ""); + EXPECT_DEATH_IF_SUPPORTED(static_cast(FX_Alloc(int, kMaxIntAlloc)), ""); int* ptr = FX_Alloc(int, 1); EXPECT_TRUE(ptr); - EXPECT_DEATH_IF_SUPPORTED((void)FX_Realloc(int, ptr, kMaxIntAlloc), ""); + EXPECT_DEATH_IF_SUPPORTED( + static_cast(FX_Realloc(int, ptr, kMaxIntAlloc)), ""); FX_Free(ptr); } @@ -37,7 +38,8 @@ TEST(fxcrt, FX_AllocOverflow) { ptr = FX_Alloc(int, 1); EXPECT_TRUE(ptr); - EXPECT_DEATH_IF_SUPPORTED((void)FX_Realloc(int, ptr, kOverflowIntAlloc), ""); + EXPECT_DEATH_IF_SUPPORTED( + static_cast(FX_Realloc(int, ptr, kOverflowIntAlloc)), ""); FX_Free(ptr); } -- cgit v1.2.3