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/resources/sprite/animatedsprite.cpp | 2 +- src/resources/sprite/animatedsprite.h | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/resources/sprite') diff --git a/src/resources/sprite/animatedsprite.cpp b/src/resources/sprite/animatedsprite.cpp index 4daf6f7f6..87fe72a7b 100644 --- a/src/resources/sprite/animatedsprite.cpp +++ b/src/resources/sprite/animatedsprite.cpp @@ -405,7 +405,7 @@ std::string AnimatedSprite::getIdPath() const restrict2 return mSprite->getIdPath(); } -const Image* AnimatedSprite::getImage() const restrict2 noexcept +const Image* AnimatedSprite::getImage() const restrict2 noexcept2 { return mFrame ? mFrame->image : nullptr; } diff --git a/src/resources/sprite/animatedsprite.h b/src/resources/sprite/animatedsprite.h index dcf8045fb..702896be3 100644 --- a/src/resources/sprite/animatedsprite.h +++ b/src/resources/sprite/animatedsprite.h @@ -81,18 +81,18 @@ class AnimatedSprite final : public Sprite int getHeight() const restrict2 override final A_WARN_UNUSED; - const Image* getImage() const restrict2 noexcept override final + const Image* getImage() const restrict2 noexcept2 override final A_WARN_UNUSED; bool setSpriteDirection(const SpriteDirection::Type direction) restrict2 override final; - int getNumberOfLayers() const restrict2 noexcept A_WARN_UNUSED + int getNumberOfLayers() const restrict2 noexcept2 A_WARN_UNUSED { return 1; } std::string getIdPath() const restrict2 A_WARN_UNUSED; - unsigned int getCurrentFrame() const restrict2 noexcept override final + unsigned int getCurrentFrame() const restrict2 noexcept2 override final A_WARN_UNUSED { return mFrameIndex; } @@ -105,19 +105,19 @@ class AnimatedSprite final : public Sprite bool updateNumber(const unsigned num) restrict2 override final; - void clearDelayLoad() restrict2 noexcept + void clearDelayLoad() restrict2 noexcept2 { mDelayLoad = nullptr; } - void setSprite(SpriteDef *restrict const sprite) restrict2 noexcept + void setSprite(SpriteDef *restrict const sprite) restrict2 noexcept2 { mSprite = sprite; } - bool isTerminated() const restrict2 noexcept + bool isTerminated() const restrict2 noexcept2 { return mTerminated; } - static void setEnableCache(const bool b) noexcept + static void setEnableCache(const bool b) noexcept2 { mEnableCache = b; } - void setLastTime(const int time) noexcept + void setLastTime(const int time) noexcept2 { mLastTime = time; } #ifdef UNITTESTS -- cgit v1.2.3-60-g2f50