Another fix for old compilers.

12 files changed, 18 insertions, 18 deletions

diff --git a/src/being/compoundsprite.h b/src/being/compoundsprite.h
index de9c8cf6e..252372c05 100644
--- a/src/being/compoundsprite.h
+++ b/src/being/compoundsprite.h
@@ -97,7 +97,7 @@ class CompoundSprite notfinal : public Sprite
 
         bool updateNumber(const unsigned num) override final;
 
-        constexpr static void setEnableDelay(bool b) noexcept2
+        constexpr2 static void setEnableDelay(bool b) noexcept2
         { mEnableDelay = b; }
 
         int getLastTime() const noexcept2 A_WARN_UNUSED
diff --git a/src/game.h b/src/game.h
index ceebe1e09..e620aeea6 100644
--- a/src/game.h
+++ b/src/game.h
@@ -70,7 +70,7 @@ class Game final
         static Game *instance() A_WARN_UNUSED
         { return mInstance; }
 
-        constexpr static void clearInstance() noexcept2
+        constexpr2 static void clearInstance() noexcept2
         { mInstance = nullptr; }
 
         /**
diff --git a/src/graphicsmanager.h b/src/graphicsmanager.h
index ce54bb8c2..2aa8581bf 100644
--- a/src/graphicsmanager.h
+++ b/src/graphicsmanager.h
@@ -161,7 +161,7 @@ class GraphicsManager final
         static GLenum getLastErrorCached()
         { return mLastError; }
 
-        constexpr static void resetCachedError() noexcept2
+        constexpr2 static void resetCachedError() noexcept2
         { mLastError = GL_NO_ERROR; }
 #endif  // USE_OPENGL
 
diff --git a/src/input/joystick.h b/src/input/joystick.h
index 5942dbbdc..f63f70c39 100644
--- a/src/input/joystick.h
+++ b/src/input/joystick.h
@@ -79,7 +79,7 @@ class Joystick final
 
         void setNumber(const int n);
 
-        constexpr static void setEnabled(const bool enabled) noexcept2
+        constexpr2 static void setEnabled(const bool enabled) noexcept2
         { mEnabled = enabled; }
 
         static void getNames(std::vector <std::string> &names);
diff --git a/src/resources/imagehelper.h b/src/resources/imagehelper.h
index 90a28330e..4720de07b 100644
--- a/src/resources/imagehelper.h
+++ b/src/resources/imagehelper.h
@@ -91,12 +91,12 @@ class ImageHelper notfinal
 
         static void dumpSurfaceFormat(const SDL_Surface *const image);
 
-        constexpr static void setEnableAlpha(const bool n) noexcept2
+        constexpr2 static void setEnableAlpha(const bool n) noexcept2
         { mEnableAlpha = n; }
 
         static SDL_Surface *loadPng(SDL_RWops *const rw);
 
-        constexpr static void setOpenGlMode(const RenderType useOpenGL)
+        constexpr2 static void setOpenGlMode(const RenderType useOpenGL)
                                             noexcept2
         { mUseOpenGL = useOpenGL; }
 
diff --git a/src/resources/openglimagehelper.h b/src/resources/openglimagehelper.h
index 87faaefe7..6311ca9e5 100644
--- a/src/resources/openglimagehelper.h
+++ b/src/resources/openglimagehelper.h
@@ -98,10 +98,10 @@ class OpenGLImageHelper final : public ImageHelper
         static int getInternalTextureType() noexcept2 A_WARN_UNUSED
         { return mInternalTextureType; }
 
-        constexpr static void setInternalTextureType(const int n) noexcept2
+        constexpr2 static void setInternalTextureType(const int n) noexcept2
         { mInternalTextureType = n; }
 
-        constexpr static void setBlur(const bool n) noexcept2
+        constexpr2 static void setBlur(const bool n) noexcept2
         { mBlur = n; }
 
         static int mTextureType;
@@ -113,7 +113,7 @@ class OpenGLImageHelper final : public ImageHelper
 
         static void initTextureSampler(const GLint id);
 
-        constexpr static void setUseTextureSampler(const bool b) noexcept2
+        constexpr2 static void setUseTextureSampler(const bool b) noexcept2
         { mUseTextureSampler = b; }
 
         static void invalidate(const GLuint textureId);
diff --git a/src/resources/safeopenglimagehelper.h b/src/resources/safeopenglimagehelper.h
index 0f2382d98..3c832cfc5 100644
--- a/src/resources/safeopenglimagehelper.h
+++ b/src/resources/safeopenglimagehelper.h
@@ -98,10 +98,10 @@ class SafeOpenGLImageHelper final : public ImageHelper
         static int getInternalTextureType() A_WARN_UNUSED
         { return mInternalTextureType; }
 
-        constexpr static void setInternalTextureType(const int n) noexcept2
+        constexpr2 static void setInternalTextureType(const int n) noexcept2
         { mInternalTextureType = n; }
 
-        constexpr static void setBlur(const bool n) noexcept2
+        constexpr2 static void setBlur(const bool n) noexcept2
         { mBlur = n; }
 
         static int mTextureType;
@@ -113,7 +113,7 @@ class SafeOpenGLImageHelper final : public ImageHelper
 
         static void initTextureSampler(const GLint id);
 
-        constexpr static void setUseTextureSampler(const bool b) noexcept2
+        constexpr2 static void setUseTextureSampler(const bool b) noexcept2
         { mUseTextureSampler = b; }
 
         static void invalidate(const GLuint textureId);
diff --git a/src/resources/sdl2imagehelper.h b/src/resources/sdl2imagehelper.h
index aa40aa065..ef5bfad79 100644
--- a/src/resources/sdl2imagehelper.h
+++ b/src/resources/sdl2imagehelper.h
@@ -67,7 +67,7 @@ class SDLImageHelper final : public ImageHelper
                                 SDL_Surface *const surface)
                                 const override final;
 
-        constexpr static void SDLSetEnableAlphaCache(const bool n) noexcept2
+        constexpr2 static void SDLSetEnableAlphaCache(const bool n) noexcept2
         { mEnableAlphaCache = n; }
 
         static bool SDLGetEnableAlphaCache() noexcept2 A_WARN_UNUSED
@@ -81,7 +81,7 @@ class SDLImageHelper final : public ImageHelper
                                   SDL_Surface *restrict const dst,
                                   SDL_Rect *restrict const dstrect);
 
-        constexpr static void setRenderer(SDL_Renderer *const renderer)
+        constexpr2 static void setRenderer(SDL_Renderer *const renderer)
                                           noexcept2
         { mRenderer = renderer; }
 
diff --git a/src/resources/sdl2softwareimagehelper.h b/src/resources/sdl2softwareimagehelper.h
index 6db14868f..789bfea85 100644
--- a/src/resources/sdl2softwareimagehelper.h
+++ b/src/resources/sdl2softwareimagehelper.h
@@ -60,7 +60,7 @@ class SDL2SoftwareImageHelper final : public ImageHelper
                                  const float alpha)
                                  override final A_WARN_UNUSED;
 
-        constexpr static void SDLSetEnableAlphaCache(const bool n) noexcept2
+        constexpr2 static void SDLSetEnableAlphaCache(const bool n) noexcept2
         { mEnableAlphaCache = n; }
 
         static bool SDLGetEnableAlphaCache() noexcept2 A_WARN_UNUSED
diff --git a/src/resources/sdlimagehelper.h b/src/resources/sdlimagehelper.h
index 57fd33d68..7b0a979f9 100644
--- a/src/resources/sdlimagehelper.h
+++ b/src/resources/sdlimagehelper.h
@@ -81,7 +81,7 @@ class SDLImageHelper final : public ImageHelper
                                 SDL_Surface *const surface)
                                 const override final;
 
-        constexpr static void SDLSetEnableAlphaCache(const bool n) noexcept2
+        constexpr2 static void SDLSetEnableAlphaCache(const bool n) noexcept2
         { mEnableAlphaCache = n; }
 
         static bool SDLGetEnableAlphaCache() noexcept2 A_WARN_UNUSED
diff --git a/src/resources/sprite/animatedsprite.h b/src/resources/sprite/animatedsprite.h
index bd81f1a4e..93aa9d8fb 100644
--- a/src/resources/sprite/animatedsprite.h
+++ b/src/resources/sprite/animatedsprite.h
@@ -114,7 +114,7 @@ class AnimatedSprite final : public Sprite
         bool isTerminated() const restrict2 noexcept2
         { return mTerminated; }
 
-        constexpr static void setEnableCache(const bool b) noexcept2
+        constexpr2 static void setEnableCache(const bool b) noexcept2
         { mEnableCache = b; }
 
         void setLastTime(const int time) noexcept2
diff --git a/src/resources/surfaceimagehelper.h b/src/resources/surfaceimagehelper.h
index 243a370c1..65aa682a9 100644
--- a/src/resources/surfaceimagehelper.h
+++ b/src/resources/surfaceimagehelper.h
@@ -63,7 +63,7 @@ class SurfaceImageHelper final : public ImageHelper
                                  const float alpha)
                                  override final A_WARN_UNUSED;
 
-        constexpr static void SDLSetEnableAlphaCache(const bool n) noexcept2
+        constexpr2 static void SDLSetEnableAlphaCache(const bool n) noexcept2
         { mEnableAlphaCache = n; }
 
         static bool SDLGetEnableAlphaCache() noexcept2 A_WARN_UNUSED