From fe08482976fb43cc93e4f8a3ea799d98dfe96ada Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Wed, 30 Jul 2014 14:16:25 -0700 Subject: Fix incorrect override of GetLayoutOrder(). fsdk_baseform.h:63:19: error: 'CPDFSDK_Widget::GetLayoutOrder' hides overloaded virtual function [-Werror,-Woverloaded-virtual] virtual int GetLayoutOrder() {return 2;} ^ fsdk_baseannot.h:70:18: note: hidden overloaded virtual function 'CPDFSDK_Annot::GetLayoutOrder' declared here: different qualifiers (const vs none) virtual int GetLayoutOrder() const { return 5; } ^ On Windows, I believe MSVS treats these as override since it's such a common and easy mistake, but clang and gcc do what the standard specifies. Add a "const" to the function in the subclass so that this is actually an override, as intended. BUG=pdfium:29 R=bo_xu@foxitsoftware.com Review URL: https://codereview.chromium.org/427173002 --- fpdfsdk/include/fsdk_baseform.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'fpdfsdk/include') diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h index b93cbbd81f..073c99f199 100644 --- a/fpdfsdk/include/fsdk_baseform.h +++ b/fpdfsdk/include/fsdk_baseform.h @@ -60,7 +60,7 @@ public: int GetFieldType() const; //define layout order to 2. - virtual int GetLayoutOrder() {return 2;} + virtual int GetLayoutOrder() const {return 2;} /* FIELDFLAG_READONLY FIELDFLAG_REQUIRED -- cgit v1.2.3