diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2017-07-17 14:53:00 +1000 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2017-07-17 14:53:00 +1000 |
| commit | 3065f334c00ee1eaf91d40fe139806111dd959fd (patch) | |
| tree | e28e53caa194462836bad823c06b7fb0b3ba3737 /lexers/LexCPP.cxx | |
| parent | db6528b463841e9ea05fb9dad1559d263b1f6a34 (diff) | |
| download | scintilla-mirror-3065f334c00ee1eaf91d40fe139806111dd959fd.tar.gz | |
Backport: Mark overriding methods as "override".
Backport of changeset 6350:fdc0103a84d0.
Diffstat (limited to 'lexers/LexCPP.cxx')
| -rw-r--r-- | lexers/LexCPP.cxx | 8 |
1 files 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<int>(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)) |