summaryrefslogtreecommitdiff
path: root/src/resources/map
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-17 20:03:14 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-17 20:03:14 +0300
commit55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d (patch)
treeb1108bef76eed589fcb0028c4bd97f14510e940f /src/resources/map
parent72b9b0b8b7f3e0b60bf7a926b44aaa589dd131e8 (diff)
downloadplus-55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.tar.gz
plus-55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.tar.bz2
plus-55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.tar.xz
plus-55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.zip
Remove override keyword, if it present with final.
Diffstat (limited to 'src/resources/map')
-rw-r--r--src/resources/map/map.h2
-rw-r--r--src/resources/map/maplayer.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/map/map.h b/src/resources/map/map.h
index 4a0f71e82..1b87f8288 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 override final;
+ restrict2 final;
MapItem *findPortalXY(const int x,
const int y) const restrict2 A_WARN_UNUSED;
diff --git a/src/resources/map/maplayer.h b/src/resources/map/maplayer.h
index 45dcaec02..da35c239e 100644
--- a/src/resources/map/maplayer.h
+++ b/src/resources/map/maplayer.h
@@ -155,7 +155,7 @@ class MapLayer final: public ConfigListener
{ return mHeight; }
void optionChanged(const std::string &restrict value)
- restrict override final;
+ restrict final;
void setDrawLayerFlags(const MapTypeT &restrict n) restrict;