diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-04-30 21:18:24 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-04-30 21:18:24 +0300 |
| commit | 9ff808fb20962884d56147d46c8e4de915a0735d (patch) | |
| tree | b09025e75c2e57a48e5be971953edbc14b466846 /src/gui/fonts | |
| parent | aaa274245a584c633dcfdb5444bbc1dc21c0c28f (diff) | |
| download | manaplus-9ff808fb20962884d56147d46c8e4de915a0735d.tar.gz manaplus-9ff808fb20962884d56147d46c8e4de915a0735d.tar.bz2 manaplus-9ff808fb20962884d56147d46c8e4de915a0735d.tar.xz manaplus-9ff808fb20962884d56147d46c8e4de915a0735d.zip | |
Disable noexcept for clang and old gcc versions.
Diffstat (limited to 'src/gui/fonts')
| -rw-r--r-- | src/gui/fonts/font.cpp | 2 | ||||
| -rw-r--r-- | src/gui/fonts/font.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/fonts/font.cpp b/src/gui/fonts/font.cpp index 0f36e5f0e..ffd1db347 100644 --- a/src/gui/fonts/font.cpp +++ b/src/gui/fonts/font.cpp @@ -366,7 +366,7 @@ int Font::getStringIndexAt(const std::string& text, const int x) const return CAST_S32(sz); } -const TextChunkList *Font::getCache() const noexcept +const TextChunkList *Font::getCache() const noexcept2 { return mCache; } diff --git a/src/gui/fonts/font.h b/src/gui/fonts/font.h index 2a3131fa3..ef7ff9a5a 100644 --- a/src/gui/fonts/font.h +++ b/src/gui/fonts/font.h @@ -101,7 +101,7 @@ class Font final int getHeight() const restrict2 A_WARN_UNUSED; - const TextChunkList *getCache() const restrict2 noexcept + const TextChunkList *getCache() const restrict2 noexcept2 A_CONST A_WARN_UNUSED; /** @@ -120,10 +120,10 @@ class Font final void slowLogic(const int rnd) restrict2; - unsigned int getCreateCounter() const restrict2 noexcept A_WARN_UNUSED + unsigned int getCreateCounter() const restrict2 noexcept2 A_WARN_UNUSED { return mCreateCounter; } - unsigned int getDeleteCounter() const restrict2 noexcept A_WARN_UNUSED + unsigned int getDeleteCounter() const restrict2 noexcept2 A_WARN_UNUSED { return mDeleteCounter; } int getStringIndexAt(const std::string &restrict text, |