summaryrefslogtreecommitdiff
path: root/src/resources/sprite
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-30 21:18:24 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-30 21:18:24 +0300
commit9ff808fb20962884d56147d46c8e4de915a0735d (patch)
treeb09025e75c2e57a48e5be971953edbc14b466846 /src/resources/sprite
parentaaa274245a584c633dcfdb5444bbc1dc21c0c28f (diff)
downloadplus-9ff808fb20962884d56147d46c8e4de915a0735d.tar.gz
plus-9ff808fb20962884d56147d46c8e4de915a0735d.tar.bz2
plus-9ff808fb20962884d56147d46c8e4de915a0735d.tar.xz
plus-9ff808fb20962884d56147d46c8e4de915a0735d.zip
Disable noexcept for clang and old gcc versions.
Diffstat (limited to 'src/resources/sprite')
-rw-r--r--src/resources/sprite/animatedsprite.cpp2
-rw-r--r--src/resources/sprite/animatedsprite.h16
2 files changed, 9 insertions, 9 deletions
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