From 3065f334c00ee1eaf91d40fe139806111dd959fd Mon Sep 17 00:00:00 2001 From: Neil Hodgson Date: Mon, 17 Jul 2017 14:53:00 +1000 Subject: Backport: Mark overriding methods as "override". Backport of changeset 6350:fdc0103a84d0. --- lexers/LexCPP.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx index 533a2b03e..e8e3e6ca0 100644 --- a/lexers/LexCPP.cxx +++ b/lexers/LexCPP.cxx @@ -579,12 +579,12 @@ public: const char * SCI_METHOD GetSubStyleBases() override { return styleSubable; } - int SCI_METHOD NamedStyles() { + int SCI_METHOD NamedStyles() override { return std::max(subStyles.LastAllocated() + 1, static_cast(ELEMENTS(lexicalClasses))) + activeFlag; } - const char * SCI_METHOD NameOfStyle(int style) { + const char * SCI_METHOD NameOfStyle(int style) override { if (style >= NamedStyles()) return ""; if (style < ELEMENTS(lexicalClasses)) @@ -592,7 +592,7 @@ public: // TODO: inactive and substyles return ""; } - const char * SCI_METHOD TagsOfStyle(int style) { + const char * SCI_METHOD TagsOfStyle(int style) override { if (style >= NamedStyles()) return "Excess"; returnBuffer.clear(); @@ -624,7 +624,7 @@ public: } return ""; } - const char * SCI_METHOD DescriptionOfStyle(int style) { + const char * SCI_METHOD DescriptionOfStyle(int style) override { if (style >= NamedStyles()) return ""; if (style < ELEMENTS(lexicalClasses)) -- cgit v1.2.3