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 --- fpdfsdk/fpdf_formfill.cpp | 4 ++-- fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/fpdf_formfill.cpp b/fpdfsdk/fpdf_formfill.cpp index 8ebf7faaff..62d2c00d55 100644 --- a/fpdfsdk/fpdf_formfill.cpp +++ b/fpdfsdk/fpdf_formfill.cpp @@ -272,9 +272,9 @@ FPDFPage_FormFieldZOrderAtPoint(FPDF_FORMHANDLE hHandle, return -1; CPDF_InterForm interform(pPage->GetDocument()); int z_order = -1; - static_cast(interform.GetControlAtPoint( + (void)interform.GetControlAtPoint( pPage, CFX_PointF(static_cast(page_x), static_cast(page_y)), - &z_order)); + &z_order); return z_order; } diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp index 595c4a919f..f9f5981efb 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp +++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp @@ -644,7 +644,7 @@ bool CPDFXFA_DocEnvironment::OnBeforeNotifySubmit() { if (!it) return true; - static_cast(it->MoveToNext()); + (void)it->MoveToNext(); CXFA_Node* pNode = it->MoveToNext(); while (pNode) { -- cgit v1.2.3