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/resources/surfaceimagehelper.h | |
parent | 53530f76275df76406a9ce438a33df78c50d0948 (diff) | |
download | manaverse-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/surfaceimagehelper.h')
-rw-r--r-- | src/resources/surfaceimagehelper.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/surfaceimagehelper.h b/src/resources/surfaceimagehelper.h index 3dc8dde89..c028748e7 100644 --- a/src/resources/surfaceimagehelper.h +++ b/src/resources/surfaceimagehelper.h @@ -57,12 +57,12 @@ class SurfaceImageHelper 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; static void SDLSetEnableAlphaCache(const bool n) { mEnableAlphaCache = n; } @@ -74,7 +74,7 @@ class SurfaceImageHelper final : public ImageHelper * Tells if the image was loaded using OpenGL or SDL * @return true if OpenGL, false if SDL. */ - RenderType useOpenGL() const final A_WARN_UNUSED; + RenderType useOpenGL() const override final A_WARN_UNUSED; static SDL_Surface* SDLDuplicateSurface(SDL_Surface *const tmpImage) A_WARN_UNUSED; |