From 9ff808fb20962884d56147d46c8e4de915a0735d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 30 Apr 2016 21:18:24 +0300 Subject: Disable noexcept for clang and old gcc versions. --- src/render/graphics.h | 32 ++++++++++++++++---------------- src/render/imagegraphics.h | 4 ++-- src/render/normalopenglgraphics.h | 2 +- src/render/openglgraphicsdef.hpp | 2 +- src/render/openglgraphicsdefadvanced.hpp | 2 +- src/render/renderers.cpp | 6 +++--- src/render/renderers.h | 2 +- src/render/sdl2graphics.h | 2 +- src/render/sdl2softwaregraphics.h | 2 +- src/render/shaders/shader.h | 2 +- src/render/shaders/shaderprogram.h | 2 +- src/render/surfacegraphics.h | 8 ++++---- 12 files changed, 33 insertions(+), 33 deletions(-) (limited to 'src/render') diff --git a/src/render/graphics.h b/src/render/graphics.h index 8334d315d..dda3363e6 100644 --- a/src/render/graphics.h +++ b/src/render/graphics.h @@ -135,7 +135,7 @@ class Graphics notfinal mRect.h = static_cast(height); } - SDL_Window *getWindow() const restrict2 noexcept + SDL_Window *getWindow() const restrict2 noexcept2 { return mWindow; } /** @@ -144,7 +144,7 @@ class Graphics notfinal */ void setSync(const bool sync) restrict2; - bool getSync() const restrict2 noexcept A_WARN_UNUSED + bool getSync() const restrict2 noexcept2 A_WARN_UNUSED { return mSync; } /** @@ -274,37 +274,37 @@ class Graphics notfinal ClipRect &getTopClip() const restrict2 A_WARN_UNUSED { return mClipStack.top(); } - void setRedraw(const bool n) restrict2 noexcept + void setRedraw(const bool n) restrict2 noexcept2 { mRedraw = n; } - bool getRedraw() const restrict2 noexcept A_WARN_UNUSED + bool getRedraw() const restrict2 noexcept2 A_WARN_UNUSED { return mRedraw; } - void setSecure(const bool n) restrict2 noexcept + void setSecure(const bool n) restrict2 noexcept2 { mSecure = n; } - bool getSecure() const restrict2 noexcept A_WARN_UNUSED + bool getSecure() const restrict2 noexcept2 A_WARN_UNUSED { return mSecure; } - int getBpp() const restrict2 noexcept A_WARN_UNUSED + int getBpp() const restrict2 noexcept2 A_WARN_UNUSED { return mBpp; } - bool getFullScreen() const restrict2 noexcept A_WARN_UNUSED + bool getFullScreen() const restrict2 noexcept2 A_WARN_UNUSED { return mFullscreen; } - bool getHWAccel() const restrict2 noexcept A_WARN_UNUSED + bool getHWAccel() const restrict2 noexcept2 A_WARN_UNUSED { return mHWAccel; } - bool getDoubleBuffer() const restrict2 noexcept A_WARN_UNUSED + bool getDoubleBuffer() const restrict2 noexcept2 A_WARN_UNUSED { return mDoubleBuffer; } - RenderType getOpenGL() const restrict2 noexcept A_WARN_UNUSED + RenderType getOpenGL() const restrict2 noexcept2 A_WARN_UNUSED { return mOpenGL; } - void setNoFrame(const bool n) restrict2 noexcept + void setNoFrame(const bool n) restrict2 noexcept2 { mNoFrame = n; } - const std::string &getName() const restrict2 noexcept A_WARN_UNUSED + const std::string &getName() const restrict2 noexcept2 A_WARN_UNUSED { return mName; } virtual void initArrays(const int vertCount A_UNUSED) restrict2 @@ -316,7 +316,7 @@ class Graphics notfinal mAlpha = (color.a != 255); } - const Color &getColor() const restrict2 noexcept + const Color &getColor() const restrict2 noexcept2 { return mColor; } #ifdef DEBUG_DRAW_CALLS @@ -356,10 +356,10 @@ class Graphics notfinal virtual void completeCache() restrict2 = 0; - int getScale() const restrict2 noexcept + int getScale() const restrict2 noexcept2 { return mScale; } - virtual bool isAllowScale() const restrict2 noexcept + virtual bool isAllowScale() const restrict2 noexcept2 { return false; } void setScale(int scale) restrict2; diff --git a/src/render/imagegraphics.h b/src/render/imagegraphics.h index 8d4a72368..e1bdad741 100644 --- a/src/render/imagegraphics.h +++ b/src/render/imagegraphics.h @@ -45,10 +45,10 @@ class ImegeGraphics final : public Graphics ~ImegeGraphics(); - void setTarget(Image *const target) restrict2 noexcept + void setTarget(Image *const target) restrict2 noexcept2 { mTarget = target; } - Image *getTarget() const restrict2 noexcept + Image *getTarget() const restrict2 noexcept2 { return mTarget; } void beginDraw() restrict2 override final diff --git a/src/render/normalopenglgraphics.h b/src/render/normalopenglgraphics.h index 8f6652775..3c2e0baf9 100644 --- a/src/render/normalopenglgraphics.h +++ b/src/render/normalopenglgraphics.h @@ -89,7 +89,7 @@ class NormalOpenGLGraphics final : public Graphics #include "render/openglgraphicsdefadvanced.hpp" #ifdef DEBUG_BIND_TEXTURE - unsigned int getBinds() const restrict2 noexcept + unsigned int getBinds() const restrict2 noexcept2 { return mLastBinds; } #endif diff --git a/src/render/openglgraphicsdef.hpp b/src/render/openglgraphicsdef.hpp index 42f61c2be..664686abd 100644 --- a/src/render/openglgraphicsdef.hpp +++ b/src/render/openglgraphicsdef.hpp @@ -34,7 +34,7 @@ public: void updateTextureFormat() restrict2; - bool isAllowScale() const restrict2 noexcept override final + bool isAllowScale() const restrict2 noexcept2 override final { return true; } void clearScreen() const restrict2 override final; diff --git a/src/render/openglgraphicsdefadvanced.hpp b/src/render/openglgraphicsdefadvanced.hpp index c63c6ba7f..1428525ff 100644 --- a/src/render/openglgraphicsdefadvanced.hpp +++ b/src/render/openglgraphicsdefadvanced.hpp @@ -27,7 +27,7 @@ public: void initArrays(const int vertCount) restrict2 override final; #ifdef DEBUG_DRAW_CALLS - unsigned int getDrawCalls() restrict2 const noexcept + unsigned int getDrawCalls() restrict2 const noexcept2 { return mLastDrawCalls; } static unsigned int mDrawCalls; diff --git a/src/render/renderers.cpp b/src/render/renderers.cpp index 6d385d294..a11c438d1 100644 --- a/src/render/renderers.cpp +++ b/src/render/renderers.cpp @@ -22,9 +22,9 @@ #include "debug.h" -static RenderType getDefault() noexcept A_CONST; +static RenderType getDefault() noexcept2 A_CONST; -static RenderType getDefault() noexcept +static RenderType getDefault() noexcept2 { #ifdef USE_OPENGL #ifdef ANDROID @@ -37,7 +37,7 @@ static RenderType getDefault() noexcept #endif } -RenderType intToRenderType(const int mode) noexcept +RenderType intToRenderType(const int mode) noexcept2 { if (mode < 0 || mode >= RENDER_LAST) return getDefault(); diff --git a/src/render/renderers.h b/src/render/renderers.h index 92aade7e9..e668e5039 100644 --- a/src/render/renderers.h +++ b/src/render/renderers.h @@ -25,7 +25,7 @@ #include "localconsts.h" -RenderType intToRenderType(const int mode) noexcept A_CONST; +RenderType intToRenderType(const int mode) noexcept2 A_CONST; #define isBatchDrawRenders(val) ((val) != RENDER_SAFE_OPENGL) diff --git a/src/render/sdl2graphics.h b/src/render/sdl2graphics.h index 250002d3f..47578bb3f 100644 --- a/src/render/sdl2graphics.h +++ b/src/render/sdl2graphics.h @@ -97,7 +97,7 @@ class SDLGraphics final : public Graphics */ ~SDLGraphics(); - void setRendererFlags(const uint32_t flags) restrict noexcept override + void setRendererFlags(const uint32_t flags) restrict noexcept2 override { mRendererFlags = flags; } #include "render/graphicsdef.hpp" diff --git a/src/render/sdl2softwaregraphics.h b/src/render/sdl2softwaregraphics.h index ac6970cb1..c1adfe359 100644 --- a/src/render/sdl2softwaregraphics.h +++ b/src/render/sdl2softwaregraphics.h @@ -57,7 +57,7 @@ class SDL2SoftwareGraphics final : public Graphics ~SDL2SoftwareGraphics(); void setRendererFlags(const uint32_t flags) - restrict2 noexcept override final + restrict2 noexcept2 override final { mRendererFlags = flags; } #include "render/graphicsdef.hpp" diff --git a/src/render/shaders/shader.h b/src/render/shaders/shader.h index ca54c0e92..21bc48b30 100644 --- a/src/render/shaders/shader.h +++ b/src/render/shaders/shader.h @@ -34,7 +34,7 @@ class Shader final : public Resource A_DELETE_COPY(Shader) - unsigned int getShaderId() const noexcept + unsigned int getShaderId() const noexcept2 { return mShaderId; } protected: diff --git a/src/render/shaders/shaderprogram.h b/src/render/shaders/shaderprogram.h index 4898798e1..d1c55206e 100644 --- a/src/render/shaders/shaderprogram.h +++ b/src/render/shaders/shaderprogram.h @@ -38,7 +38,7 @@ class ShaderProgram final : public Resource A_DELETE_COPY(ShaderProgram) - unsigned int getProgramId() const noexcept + unsigned int getProgramId() const noexcept2 { return mProgramId; } protected: diff --git a/src/render/surfacegraphics.h b/src/render/surfacegraphics.h index 0706dfc65..f8faa327b 100644 --- a/src/render/surfacegraphics.h +++ b/src/render/surfacegraphics.h @@ -47,10 +47,10 @@ class SurfaceGraphics final : public Graphics ~SurfaceGraphics(); - void setTarget(SDL_Surface *restrict const target) restrict2 noexcept + void setTarget(SDL_Surface *restrict const target) restrict2 noexcept2 { mTarget = target; } - SDL_Surface *getTarget() const restrict2 noexcept + SDL_Surface *getTarget() const restrict2 noexcept2 { return mTarget; } void beginDraw() restrict2 override final @@ -152,10 +152,10 @@ class SurfaceGraphics final : public Graphics restrict2 override final A_NONNULL(2) { } - void setBlitMode(const BlitModeT mode) restrict2 noexcept + void setBlitMode(const BlitModeT mode) restrict2 noexcept2 { mBlitMode = mode; } - BlitModeT getBlitMode() const restrict2 noexcept A_WARN_UNUSED + BlitModeT getBlitMode() const restrict2 noexcept2 A_WARN_UNUSED { return mBlitMode; } void fillRectangle(const Rect &restrict rect A_UNUSED) -- cgit v1.2.3-60-g2f50