summaryrefslogtreecommitdiff
path: root/src/resources/map/map.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-17 23:06:06 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-17 23:06:56 +0300
commitdba0611175c8d4a56dfbc918ccef139351e5c3e0 (patch)
treeb3c7a5684604facc0f0f5656fe373958c53dc5ad /src/resources/map/map.h
parent53530f76275df76406a9ce438a33df78c50d0948 (diff)
downloadManaVerse-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.gz
ManaVerse-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.bz2
ManaVerse-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.xz
ManaVerse-dba0611175c8d4a56dfbc918ccef139351e5c3e0.zip
Revert "Remove override keyword, if it present with final."
This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.
Diffstat (limited to 'src/resources/map/map.h')
-rw-r--r--src/resources/map/map.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/resources/map/map.h b/src/resources/map/map.h
index 1b87f8288..4a0f71e82 100644
--- a/src/resources/map/map.h
+++ b/src/resources/map/map.h
@@ -283,7 +283,7 @@ class Map final : public Properties, public ConfigListener
const restrict2 A_WARN_UNUSED;
void optionChanged(const std::string &restrict value)
- restrict2 final;
+ restrict2 override final;
MapItem *findPortalXY(const int x,
const int y) const restrict2 A_WARN_UNUSED;