From 833d705688d21402357ef1ab40f4706dbadfb79a Mon Sep 17 00:00:00 2001 From: Oliver Chang Date: Tue, 19 Jan 2016 15:15:37 -0800 Subject: Merge to XFA: Remove an extra "const" in fpdf_objects. TBR=weili@chromium.org Original Review URL: https://codereview.chromium.org/1602323002 . (cherry picked from commit b196c7bebad66c9938d2705ccf64961bcdd774e2) Review URL: https://codereview.chromium.org/1607473008 . --- core/include/fpdfapi/fpdf_objects.h | 2 +- core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h index fdf11720f4..a53907b1f0 100644 --- a/core/include/fpdfapi/fpdf_objects.h +++ b/core/include/fpdfapi/fpdf_objects.h @@ -102,7 +102,7 @@ class CPDF_Object { ~CPDF_Object() {} void Destroy(); - const CPDF_Object* const GetBasicObject() const; + const CPDF_Object* GetBasicObject() const; FX_DWORD m_Type; FX_DWORD m_ObjNum; diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp index a3b0568931..56f5a2c4b4 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp @@ -46,7 +46,7 @@ void CPDF_Object::Destroy() { } } -const CPDF_Object* const CPDF_Object::GetBasicObject() const { +const CPDF_Object* CPDF_Object::GetBasicObject() const { const CPDF_Reference* pRef = AsReference(); if (!pRef) { // This is not an indirect reference. -- cgit v1.2.3