Fix compilation errors with SDL2.s20161213

3 files changed, 3 insertions, 8 deletions

diff --git a/src/resources/sdl2softwareimagehelper.h b/src/resources/sdl2softwareimagehelper.h
index 789bfea85..47a0f7ed5 100644
--- a/src/resources/sdl2softwareimagehelper.h
+++ b/src/resources/sdl2softwareimagehelper.h
@@ -74,8 +74,7 @@ class SDL2SoftwareImageHelper final : public ImageHelper
                                   SDL_Surface *restrict const dst,
                                   SDL_Rect *restrict const dstrect);
 
-        constexpr2 static void setFormat(SDL_PixelFormat *const format)
-                                         noexcept2
+        static void setFormat(SDL_PixelFormat *const format) noexcept2
         {
             mFormat = format;
             if (mFormat)
diff --git a/src/resources/surfaceimagehelper.cpp b/src/resources/surfaceimagehelper.cpp
index e74c34477..b0e9548a6 100644
--- a/src/resources/surfaceimagehelper.cpp
+++ b/src/resources/surfaceimagehelper.cpp
@@ -73,11 +73,6 @@ Image *SurfaceImageHelper::_SDLload(SDL_Surface *tmpImage) const
     return new Image(image, false, nullptr);
 }
 
-RenderType SurfaceImageHelper::useOpenGL() const
-{
-    return RENDER_SOFTWARE;
-}
-
 int SurfaceImageHelper::combineSurface(SDL_Surface *restrict const src,
                                        SDL_Rect *restrict const srcrect,
                                        SDL_Surface *restrict const dst,
diff --git a/src/resources/surfaceimagehelper.h b/src/resources/surfaceimagehelper.h
index 65aa682a9..18eda5149 100644
--- a/src/resources/surfaceimagehelper.h
+++ b/src/resources/surfaceimagehelper.h
@@ -73,7 +73,8 @@ 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 override final A_WARN_UNUSED;
+        RenderType useOpenGL() const noexcept2 override final A_WARN_UNUSED
+        { return RENDER_SOFTWARE; }
 
         static SDL_Surface* SDLDuplicateSurface(SDL_Surface *const tmpImage)
                                                 A_WARN_UNUSED;