summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-12-08 21:46:30 +0300
committerAndrei Karas <akaras@inbox.ru>2018-12-08 21:46:30 +0300
commit501c48e576e53ce062336c2953d19591bdd7aba2 (patch)
tree9d0512b6715f8adf73b346821646ede4221ef2c8
parent6d26efcbd7e4c60dd56a0309c624a2e6622b7886 (diff)
downloadplus-501c48e576e53ce062336c2953d19591bdd7aba2.tar.gz
plus-501c48e576e53ce062336c2953d19591bdd7aba2.tar.bz2
plus-501c48e576e53ce062336c2953d19591bdd7aba2.tar.xz
plus-501c48e576e53ce062336c2953d19591bdd7aba2.zip
Remove some wrong constexpr3 usage.v1.8.12.8
-rw-r--r--src/resources/map/maplayer.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/resources/map/maplayer.h b/src/resources/map/maplayer.h
index 5794ca635..ec3c846a3 100644
--- a/src/resources/map/maplayer.h
+++ b/src/resources/map/maplayer.h
@@ -140,12 +140,12 @@ class MapLayer final : public MemoryCounter, public ConfigListener
constexpr3 bool isFringeLayer() const restrict noexcept2 A_WARN_UNUSED
{ return mIsFringeLayer; }
- constexpr3 void setSpecialLayer(const SpecialLayer *restrict const val)
- restrict noexcept2
+ void setSpecialLayer(const SpecialLayer *restrict const val)
+ restrict noexcept2
{ mSpecialLayer = val; }
- constexpr3 void setTempLayer(const SpecialLayer *restrict const val)
- restrict noexcept2
+ void setTempLayer(const SpecialLayer *restrict const val)
+ restrict noexcept2
{ mTempLayer = val; }
constexpr3 int getWidth() const restrict noexcept2 A_WARN_UNUSED
@@ -157,8 +157,8 @@ class MapLayer final : public MemoryCounter, public ConfigListener
void optionChanged(const std::string &restrict value)
restrict override final;
- constexpr3 void setDrawLayerFlags(const MapTypeT &restrict n)
- restrict noexcept2
+ void setDrawLayerFlags(const MapTypeT &restrict n)
+ restrict noexcept2
{
mDrawLayerFlags = n;
mSpecialFlag = (mDrawLayerFlags != MapType::SPECIAL &&
@@ -166,7 +166,7 @@ class MapLayer final : public MemoryCounter, public ConfigListener
mDrawLayerFlags != MapType::SPECIAL4);
}
- constexpr3 void setActorsFix(const int y) restrict noexcept2
+ void setActorsFix(const int y) restrict noexcept2
{ mActorsFix = y; }
int calcMemoryLocal() const override final;
@@ -182,7 +182,7 @@ class MapLayer final : public MemoryCounter, public ConfigListener
return mTiles;
}
- constexpr3 void setTileCondition(const int c) restrict noexcept2
+ void setTileCondition(const int c) restrict noexcept2
{
mTileCondition = c;
}