summaryrefslogtreecommitdiff
path: root/src/resources/map
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/map
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/map')
-rw-r--r--src/resources/map/map.h46
-rw-r--r--src/resources/map/maplayer.h6
2 files changed, 26 insertions, 26 deletions
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<MapItem*> &getPortals() const restrict2 noexcept
+ const std::vector<MapItem*> &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<int, TileAnimation*> &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)