From 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 17 Apr 2016 20:03:14 +0300 Subject: Remove override keyword, if it present with final. --- src/resources/map/map.h | 2 +- src/resources/map/maplayer.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/resources/map') 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; -- cgit v1.2.3-70-g09d2