From 6cec70acf4ed6839c4a865c41381a6ac37de97e8 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Tue, 5 Jun 2018 14:06:10 +0000 Subject: Revert "Convert (void) to static_cast 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 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 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 Commit-Queue: Ryan Harrison --- core/fpdfapi/font/cfx_cttgsubtable.cpp | 6 +++--- core/fpdfapi/parser/cpdf_parser_embeddertest.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'core/fpdfapi') 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(GetUInt16(sp)); + (void)GetUInt16(sp); rec->GlyphArray = std::vector(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(GetUInt16(sp)); + (void)GetUInt16(sp); rec->RangeRecords = std::vector(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(GetUInt16(sp)); + (void)GetUInt16(sp); uint16_t offset = GetUInt16(sp); rec->Coverage = ParseCoverage(&raw[offset]); rec->Substitutes = std::vector(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(GetPageCount()); + (void)GetPageCount(); } TEST_F(CPDFParserEmbeddertest, Bug_325a) { -- cgit v1.2.3