summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorRyan Harrison <rharrison@chromium.org>2018-06-05 14:06:10 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-06-05 14:06:10 +0000
commit6cec70acf4ed6839c4a865c41381a6ac37de97e8 (patch)
tree03e758c713203fef08d0407c322b5337c67010f1 /core
parentfbcc5d9afb4506eea1003d024a5fac5d601cc196 (diff)
downloadpdfium-6cec70acf4ed6839c4a865c41381a6ac37de97e8.tar.xz
Revert "Convert (void) to static_cast<void> in C++ code"
This reverts commit 80c6ab7b99bcbd7b940f78dc0cac52c30249f59c. Reason for revert: (void) idiom is prevalent through out C++ code. Original change's description: > Convert (void) to static_cast<void> 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 <hnakashima@chromium.org> > Commit-Queue: Ryan Harrison <rharrison@chromium.org> TBR=thestig@chromium.org,tsepez@chromium.org,dsinclair@chromium.org,hnakashima@chromium.org,rharrison@chromium.org Change-Id: Ib6cc021c97cb1ea7c71b90346fa9b500659f565d No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://pdfium-review.googlesource.com/33890 Reviewed-by: Ryan Harrison <rharrison@chromium.org> Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'core')
-rw-r--r--core/fpdfapi/font/cfx_cttgsubtable.cpp6
-rw-r--r--core/fpdfapi/parser/cpdf_parser_embeddertest.cpp2
-rw-r--r--core/fxcrt/fx_memory_unittest.cpp8
3 files changed, 7 insertions, 9 deletions
diff --git a/core/fpdfapi/font/cfx_cttgsubtable.cpp b/core/fpdfapi/font/cfx_cttgsubtable.cpp
index 6c93363857..ae868ca5ab 100644
--- a/core/fpdfapi/font/cfx_cttgsubtable.cpp
+++ b/core/fpdfapi/font/cfx_cttgsubtable.cpp
@@ -256,7 +256,7 @@ CFX_CTTGSUBTable::ParseCoverage(FT_Bytes raw) {
void CFX_CTTGSUBTable::ParseCoverageFormat1(FT_Bytes raw,
TCoverageFormat1* rec) {
FT_Bytes sp = raw;
- static_cast<void>(GetUInt16(sp));
+ (void)GetUInt16(sp);
rec->GlyphArray = std::vector<uint16_t>(GetUInt16(sp));
for (auto& glyph : rec->GlyphArray)
glyph = GetUInt16(sp);
@@ -265,7 +265,7 @@ void CFX_CTTGSUBTable::ParseCoverageFormat1(FT_Bytes raw,
void CFX_CTTGSUBTable::ParseCoverageFormat2(FT_Bytes raw,
TCoverageFormat2* rec) {
FT_Bytes sp = raw;
- static_cast<void>(GetUInt16(sp));
+ (void)GetUInt16(sp);
rec->RangeRecords = std::vector<TRangeRecord>(GetUInt16(sp));
for (auto& rangeRec : rec->RangeRecords) {
rangeRec.Start = GetUInt16(sp);
@@ -300,7 +300,7 @@ void CFX_CTTGSUBTable::ParseSingleSubstFormat1(FT_Bytes raw, TSubTable1* rec) {
void CFX_CTTGSUBTable::ParseSingleSubstFormat2(FT_Bytes raw, TSubTable2* rec) {
FT_Bytes sp = raw;
- static_cast<void>(GetUInt16(sp));
+ (void)GetUInt16(sp);
uint16_t offset = GetUInt16(sp);
rec->Coverage = ParseCoverage(&raw[offset]);
rec->Substitutes = std::vector<uint16_t>(GetUInt16(sp));
diff --git a/core/fpdfapi/parser/cpdf_parser_embeddertest.cpp b/core/fpdfapi/parser/cpdf_parser_embeddertest.cpp
index ef9d43828e..3b8f550253 100644
--- a/core/fpdfapi/parser/cpdf_parser_embeddertest.cpp
+++ b/core/fpdfapi/parser/cpdf_parser_embeddertest.cpp
@@ -28,7 +28,7 @@ TEST_F(CPDFParserEmbeddertest, Bug_544880) {
// Shouldn't crash. We don't check the return value here because we get the
// the count from the "/Count 1" in the testcase (at the time of writing)
// rather than the actual count (0).
- static_cast<void>(GetPageCount());
+ (void)GetPageCount();
}
TEST_F(CPDFParserEmbeddertest, Bug_325a) {
diff --git a/core/fxcrt/fx_memory_unittest.cpp b/core/fxcrt/fx_memory_unittest.cpp
index d062885f85..2856bb9592 100644
--- a/core/fxcrt/fx_memory_unittest.cpp
+++ b/core/fxcrt/fx_memory_unittest.cpp
@@ -21,12 +21,11 @@ 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(static_cast<void>(FX_Alloc(int, kMaxIntAlloc)), "");
+ EXPECT_DEATH_IF_SUPPORTED((void)FX_Alloc(int, kMaxIntAlloc), "");
int* ptr = FX_Alloc(int, 1);
EXPECT_TRUE(ptr);
- EXPECT_DEATH_IF_SUPPORTED(
- static_cast<void>(FX_Realloc(int, ptr, kMaxIntAlloc)), "");
+ EXPECT_DEATH_IF_SUPPORTED((void)FX_Realloc(int, ptr, kMaxIntAlloc), "");
FX_Free(ptr);
}
@@ -38,8 +37,7 @@ TEST(fxcrt, FX_AllocOverflow) {
ptr = FX_Alloc(int, 1);
EXPECT_TRUE(ptr);
- EXPECT_DEATH_IF_SUPPORTED(
- static_cast<void>(FX_Realloc(int, ptr, kOverflowIntAlloc)), "");
+ EXPECT_DEATH_IF_SUPPORTED((void)FX_Realloc(int, ptr, kOverflowIntAlloc), "");
FX_Free(ptr);
}