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/action.cpp | 8 +++--- src/resources/action.h | 12 ++++----- src/resources/animation/animation.cpp | 20 +++++++------- src/resources/animation/animation.h | 24 ++++++++--------- src/resources/dye/dyecolor.h | 6 ++--- src/resources/map/map.h | 46 ++++++++++++++++----------------- src/resources/map/maplayer.h | 6 ++--- src/resources/sprite/animatedsprite.cpp | 2 +- src/resources/sprite/animatedsprite.h | 16 ++++++------ 9 files changed, 70 insertions(+), 70 deletions(-) (limited to 'src/resources') diff --git a/src/resources/action.cpp b/src/resources/action.cpp index a79614eef..a44cc1aee 100644 --- a/src/resources/action.cpp +++ b/src/resources/action.cpp @@ -28,7 +28,7 @@ #include "debug.h" -Action::Action(const std::string &name) noexcept : +Action::Action(const std::string &name) noexcept2 : MemoryCounter(), mAnimations(), mCounterName(name), @@ -42,7 +42,7 @@ Action::~Action() } const Animation *Action::getAnimation(SpriteDirection::Type direction) - const noexcept + const noexcept2 { Animations::const_iterator i = mAnimations.find(direction); @@ -70,12 +70,12 @@ const Animation *Action::getAnimation(SpriteDirection::Type direction) } void Action::setAnimation(const SpriteDirection::Type direction, - Animation *const animation) noexcept + Animation *const animation) noexcept2 { mAnimations[direction] = animation; } -void Action::setLastFrameDelay(const int delay) noexcept +void Action::setLastFrameDelay(const int delay) noexcept2 { FOR_EACH (AnimationIter, it, mAnimations) { diff --git a/src/resources/action.h b/src/resources/action.h index 55a2ed12d..d86846a15 100644 --- a/src/resources/action.h +++ b/src/resources/action.h @@ -39,25 +39,25 @@ class Animation; class Action final : public MemoryCounter { public: - explicit Action(const std::string &name) noexcept; + explicit Action(const std::string &name) noexcept2; A_DELETE_COPY(Action) ~Action(); void setAnimation(const SpriteDirection::Type direction, - Animation *const animation) noexcept; + Animation *const animation) noexcept2; const Animation *getAnimation(SpriteDirection::Type direction) const - noexcept A_WARN_UNUSED; + noexcept2 A_WARN_UNUSED; - unsigned getNumber() const noexcept A_WARN_UNUSED + unsigned getNumber() const noexcept2 A_WARN_UNUSED { return mNumber; } - void setNumber(const unsigned n) noexcept + void setNumber(const unsigned n) noexcept2 { mNumber = n; } - void setLastFrameDelay(const int delay) noexcept; + void setLastFrameDelay(const int delay) noexcept2; int calcMemoryLocal() const override final; diff --git a/src/resources/animation/animation.cpp b/src/resources/animation/animation.cpp index e505bc215..9c3361db5 100644 --- a/src/resources/animation/animation.cpp +++ b/src/resources/animation/animation.cpp @@ -24,14 +24,14 @@ #include "debug.h" -Animation::Animation() noexcept : +Animation::Animation() noexcept2 : mFrames(), mName("animation"), mDuration(0) { } -Animation::Animation(const std::string &name) noexcept : +Animation::Animation(const std::string &name) noexcept2 : mFrames(), mName(name), mDuration(0) @@ -40,7 +40,7 @@ Animation::Animation(const std::string &name) noexcept : void Animation::addFrame(Image *const image, const int delay, const int offsetX, const int offsetY, - const int rand) noexcept + const int rand) noexcept2 { Frame frame = { image, delay, offsetX, offsetY, rand, Frame::ANIMATION, "" }; @@ -48,41 +48,41 @@ void Animation::addFrame(Image *const image, const int delay, mDuration += delay; } -void Animation::addTerminator(const int rand) noexcept +void Animation::addTerminator(const int rand) noexcept2 { addFrame(nullptr, 0, 0, 0, rand); } -bool Animation::isTerminator(const Frame &candidate) noexcept +bool Animation::isTerminator(const Frame &candidate) noexcept2 { return (!candidate.image && candidate.type == Frame::ANIMATION); } -void Animation::addJump(const std::string &name, const int rand) noexcept +void Animation::addJump(const std::string &name, const int rand) noexcept2 { Frame frame = { nullptr, 0, 0, 0, rand, Frame::JUMP, name }; mFrames.push_back(frame); } -void Animation::addLabel(const std::string &name) noexcept +void Animation::addLabel(const std::string &name) noexcept2 { Frame frame = { nullptr, 0, 0, 0, 100, Frame::LABEL, name }; mFrames.push_back(frame); } -void Animation::addGoto(const std::string &name, const int rand) noexcept +void Animation::addGoto(const std::string &name, const int rand) noexcept2 { Frame frame = { nullptr, 0, 0, 0, rand, Frame::GOTO, name }; mFrames.push_back(frame); } -void Animation::addPause(const int delay, const int rand) noexcept +void Animation::addPause(const int delay, const int rand) noexcept2 { Frame frame = { nullptr, delay, 0, 0, rand, Frame::PAUSE, "" }; mFrames.push_back(frame); } -void Animation::setLastFrameDelay(const int delay) noexcept +void Animation::setLastFrameDelay(const int delay) noexcept2 { for (FramesRevIter it = mFrames.rbegin(), it_end = mFrames.rend(); it != it_end; ++ it) diff --git a/src/resources/animation/animation.h b/src/resources/animation/animation.h index 55668f324..7a0ade3fa 100644 --- a/src/resources/animation/animation.h +++ b/src/resources/animation/animation.h @@ -43,38 +43,38 @@ class Animation final : public MemoryCounter friend class SimpleAnimation; public: - Animation() noexcept; + Animation() noexcept2; - explicit Animation(const std::string &name) noexcept; + explicit Animation(const std::string &name) noexcept2; /** * Appends a new animation at the end of the sequence. */ void addFrame(Image *const image, const int delay, const int offsetX, const int offsetY, - const int rand) noexcept; + const int rand) noexcept2; /** * Appends an animation terminator that states that the animation * should not loop. */ - void addTerminator(const int rand) noexcept; + void addTerminator(const int rand) noexcept2; /** * Returns the length of this animation in frames. */ - size_t getLength() const noexcept A_WARN_UNUSED + size_t getLength() const noexcept2 A_WARN_UNUSED { return mFrames.size(); } - void addJump(const std::string &name, const int rand) noexcept; + void addJump(const std::string &name, const int rand) noexcept2; - void addLabel(const std::string &name) noexcept; + void addLabel(const std::string &name) noexcept2; - void addGoto(const std::string &name, const int rand) noexcept; + void addGoto(const std::string &name, const int rand) noexcept2; - void addPause(const int delay, const int rand) noexcept; + void addPause(const int delay, const int rand) noexcept2; - void setLastFrameDelay(const int delay) noexcept; + void setLastFrameDelay(const int delay) noexcept2; typedef std::vector Frames; typedef Frames::iterator FramesIter; @@ -82,7 +82,7 @@ class Animation final : public MemoryCounter typedef Frames::reverse_iterator FramesRevIter; #ifdef UNITTESTS - Frames &getFrames() noexcept + Frames &getFrames() noexcept2 { return mFrames; } #endif @@ -94,7 +94,7 @@ class Animation final : public MemoryCounter /** * Determines whether the given animation frame is a terminator. */ - static bool isTerminator(const Frame &phase) noexcept A_WARN_UNUSED; + static bool isTerminator(const Frame &phase) noexcept2 A_WARN_UNUSED; protected: Frames mFrames; diff --git a/src/resources/dye/dyecolor.h b/src/resources/dye/dyecolor.h index a7b5bbd7f..c28428a0d 100644 --- a/src/resources/dye/dyecolor.h +++ b/src/resources/dye/dyecolor.h @@ -25,14 +25,14 @@ struct DyeColor final { - DyeColor() noexcept + DyeColor() noexcept2 { value[3] = 255; } DyeColor(const uint8_t r, const uint8_t g, - const uint8_t b) noexcept + const uint8_t b) noexcept2 { value[0] = r; value[1] = g; @@ -43,7 +43,7 @@ struct DyeColor final DyeColor(const uint8_t r, const uint8_t g, const uint8_t b, - const uint8_t a) noexcept + const uint8_t a) noexcept2 { value[0] = r; value[1] = g; diff --git a/src/resources/map/map.h b/src/resources/map/map.h index 7320bb8d5..99e5002a7 100644 --- a/src/resources/map/map.h +++ b/src/resources/map/map.h @@ -174,25 +174,25 @@ class Map final : public Properties, /** * Returns the width of this map in tiles. */ - int getWidth() const restrict2 noexcept A_WARN_UNUSED + int getWidth() const restrict2 noexcept2 A_WARN_UNUSED { return mWidth; } /** * Returns the height of this map in tiles. */ - int getHeight() const restrict2 noexcept A_WARN_UNUSED + int getHeight() const restrict2 noexcept2 A_WARN_UNUSED { return mHeight; } /** * Returns the tile width of this map. */ - int getTileWidth() const restrict2 noexcept A_WARN_UNUSED + int getTileWidth() const restrict2 noexcept2 A_WARN_UNUSED { return mTileWidth; } /** * Returns the tile height used by this map. */ - int getTileHeight() const restrict2 noexcept A_WARN_UNUSED + int getTileHeight() const restrict2 noexcept2 A_WARN_UNUSED { return mTileHeight; } const std::string getMusicFile() const restrict2 A_WARN_UNUSED; @@ -246,16 +246,16 @@ class Map final : public Properties, void saveExtraLayer() const restrict2; - SpecialLayer *getTempLayer() const restrict2 noexcept A_WARN_UNUSED + SpecialLayer *getTempLayer() const restrict2 noexcept2 A_WARN_UNUSED { return mTempLayer; } - SpecialLayer *getSpecialLayer() const restrict2 noexcept A_WARN_UNUSED + SpecialLayer *getSpecialLayer() const restrict2 noexcept2 A_WARN_UNUSED { return mSpecialLayer; } - void setHasWarps(const bool n) restrict2 noexcept + void setHasWarps(const bool n) restrict2 noexcept2 { mHasWarps = n; } - bool getHasWarps() const restrict2 noexcept A_WARN_UNUSED + bool getHasWarps() const restrict2 noexcept2 A_WARN_UNUSED { return mHasWarps; } std::string getUserMapDirectory() const restrict2 A_WARN_UNUSED; @@ -279,7 +279,7 @@ class Map final : public Properties, const int x, const int y, const bool addNew = true) restrict2; - const std::vector &getPortals() const restrict2 noexcept + const std::vector &getPortals() const restrict2 noexcept2 A_WARN_UNUSED { return mMapPortals; } @@ -300,10 +300,10 @@ class Map final : public Properties, void setPvpMode(const int mode) restrict2; - int getPvpMode() const restrict2 noexcept A_WARN_UNUSED + int getPvpMode() const restrict2 noexcept2 A_WARN_UNUSED { return mPvp; } - const ObjectsLayer* getObjectsLayer() const restrict2 noexcept + const ObjectsLayer* getObjectsLayer() const restrict2 noexcept2 A_WARN_UNUSED { return mObjects; } @@ -318,40 +318,40 @@ class Map final : public Properties, void setActorsFix(const int x, const int y) restrict2; - int getVersion() const restrict2 noexcept A_WARN_UNUSED + int getVersion() const restrict2 noexcept2 A_WARN_UNUSED { return mVersion; } - void setVersion(const int n) restrict2 noexcept + void setVersion(const int n) restrict2 noexcept2 { mVersion = n; } void reduce() restrict2; - void redrawMap() restrict2 noexcept + void redrawMap() restrict2 noexcept2 { mRedrawMap = true; } bool empty() const restrict2 A_WARN_UNUSED { return mLayers.empty(); } - void setCustom(const bool b) restrict2 noexcept + void setCustom(const bool b) restrict2 noexcept2 { mCustom = b; } - bool isCustom() const restrict2 noexcept A_WARN_UNUSED + bool isCustom() const restrict2 noexcept2 A_WARN_UNUSED { return mCustom; } const std::map &getTileAnimations() const - restrict2 noexcept A_WARN_UNUSED + restrict2 noexcept2 A_WARN_UNUSED { return mTileAnimations; } - void setAtlas(Resource *restrict const atlas) restrict2 noexcept + void setAtlas(Resource *restrict const atlas) restrict2 noexcept2 { mAtlas = atlas; } - const MetaTile *getMetaTiles() const restrict2 noexcept + const MetaTile *getMetaTiles() const restrict2 noexcept2 { return mMetaTiles; } - const WalkLayer *getWalkLayer() const restrict2 noexcept + const WalkLayer *getWalkLayer() const restrict2 noexcept2 { return mWalkLayer; } - void setWalkLayer(WalkLayer *restrict const layer) restrict2 noexcept + void setWalkLayer(WalkLayer *restrict const layer) restrict2 noexcept2 { mWalkLayer = layer; } void addHeights(const MapHeights *restrict const heights) restrict2 @@ -363,7 +363,7 @@ class Map final : public Properties, void updateDrawLayersList() restrict2; - bool isHeightsPresent() const restrict2 noexcept + bool isHeightsPresent() const restrict2 noexcept2 { return mHeights != nullptr; } void updateConditionLayers() restrict2; @@ -449,7 +449,7 @@ class Map final : public Properties, const int x0, const int y0, const int w0, - const int h0) noexcept : + const int h0) noexcept2 : file(file0), x(x0), y(y0), diff --git a/src/resources/map/maplayer.h b/src/resources/map/maplayer.h index 8aa692549..6db6d344e 100644 --- a/src/resources/map/maplayer.h +++ b/src/resources/map/maplayer.h @@ -142,7 +142,7 @@ class MapLayer final: public MemoryCounter, public ConfigListener const int scrollY, const Actors &actors) const restrict A_NONNULL(2); - bool isFringeLayer() const restrict noexcept A_WARN_UNUSED + bool isFringeLayer() const restrict noexcept2 A_WARN_UNUSED { return mIsFringeLayer; } void setSpecialLayer(const SpecialLayer *restrict const val) restrict @@ -151,10 +151,10 @@ class MapLayer final: public MemoryCounter, public ConfigListener void setTempLayer(const SpecialLayer *restrict const val) restrict { mTempLayer = val; } - int getWidth() const restrict noexcept A_WARN_UNUSED + int getWidth() const restrict noexcept2 A_WARN_UNUSED { return mWidth; } - int getHeight() const restrict noexcept A_WARN_UNUSED + int getHeight() const restrict noexcept2 A_WARN_UNUSED { return mHeight; } void optionChanged(const std::string &restrict value) 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-70-g09d2