From dba0611175c8d4a56dfbc918ccef139351e5c3e0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 17 Apr 2016 23:06:06 +0300 Subject: Revert "Remove override keyword, if it present with final." This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d. --- src/resources/sdl2imagehelper.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/resources/sdl2imagehelper.h') diff --git a/src/resources/sdl2imagehelper.h b/src/resources/sdl2imagehelper.h index cb955cb6a..c1065e957 100644 --- a/src/resources/sdl2imagehelper.h +++ b/src/resources/sdl2imagehelper.h @@ -55,17 +55,17 @@ class SDLImageHelper final : public ImageHelper * Loads an image from an SDL surface. */ Image *load(SDL_Surface *const tmpImage) - final A_WARN_UNUSED; + override final A_WARN_UNUSED; Image *createTextSurface(SDL_Surface *const tmpImage, const int width, const int height, const float alpha) - final A_WARN_UNUSED; + override final A_WARN_UNUSED; void copySurfaceToImage(const Image *const image, const int x, const int y, SDL_Surface *const surface) - const final; + const override final; static void SDLSetEnableAlphaCache(const bool n) { mEnableAlphaCache = n; } -- cgit v1.2.3-60-g2f50