diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-04-17 23:06:06 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-04-17 23:06:56 +0300 |
| commit | dba0611175c8d4a56dfbc918ccef139351e5c3e0 (patch) | |
| tree | b3c7a5684604facc0f0f5656fe373958c53dc5ad /src/gui/userpalette.h | |
| parent | 53530f76275df76406a9ce438a33df78c50d0948 (diff) | |
| download | manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.gz manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.bz2 manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.xz manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.zip | |
Revert "Remove override keyword, if it present with final."
This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.
Diffstat (limited to 'src/gui/userpalette.h')
| -rw-r--r-- | src/gui/userpalette.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/userpalette.h b/src/gui/userpalette.h index 7c1146f06..9f0566198 100644 --- a/src/gui/userpalette.h +++ b/src/gui/userpalette.h @@ -119,7 +119,7 @@ class UserPalette final : public Palette, public ListModel * * @return the number of colors known */ - inline int getNumberOfElements() final A_WARN_UNUSED + inline int getNumberOfElements() override final A_WARN_UNUSED { return CAST_S32(mColors.size()); } /** @@ -129,7 +129,7 @@ class UserPalette final : public Palette, public ListModel * * @return the name of the color */ - std::string getElementAt(int i) final A_WARN_UNUSED; + std::string getElementAt(int i) override final A_WARN_UNUSED; /** * Commit the colors |