diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-03-10 11:10:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-10 11:10:35 +0100 |
| commit | 9e2ba2237f3ead25f6caa0c6838934058f795fa8 (patch) | |
| tree | 5811fb7409a0d382df30042b88d1cca896bb3a3f /memory | |
| parent | 2e5f399735258263bc1b172b5312567d1256093c (diff) | |
| parent | 28b120018135438eaff8307f3cdef921a697d47a (diff) | |
| download | UXP-9e2ba2237f3ead25f6caa0c6838934058f795fa8.tar UXP-9e2ba2237f3ead25f6caa0c6838934058f795fa8.tar.gz UXP-9e2ba2237f3ead25f6caa0c6838934058f795fa8.tar.lz UXP-9e2ba2237f3ead25f6caa0c6838934058f795fa8.tar.xz UXP-9e2ba2237f3ead25f6caa0c6838934058f795fa8.zip | |
Merge pull request #51 from trav90/buildsystem-work
Improve support for GCC 7.x
Diffstat (limited to 'memory')
| -rw-r--r-- | memory/mozalloc/mozalloc.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/memory/mozalloc/mozalloc.h b/memory/mozalloc/mozalloc.h index f7ddb7e6d..18752a798 100644 --- a/memory/mozalloc/mozalloc.h +++ b/memory/mozalloc/mozalloc.h @@ -175,6 +175,12 @@ MFBT_API void* moz_xvalloc(size_t size) */ #define MOZALLOC_THROW_IF_HAS_EXCEPTIONS #define MOZALLOC_THROW_BAD_ALLOC_IF_HAS_EXCEPTIONS +#elif __cplusplus >= 201103 +/* + * C++11 has deprecated exception-specifications in favour of |noexcept|. + */ +#define MOZALLOC_THROW_IF_HAS_EXCEPTIONS noexcept(true) +#define MOZALLOC_THROW_BAD_ALLOC_IF_HAS_EXCEPTIONS noexcept(false) #else #define MOZALLOC_THROW_IF_HAS_EXCEPTIONS throw() #define MOZALLOC_THROW_BAD_ALLOC_IF_HAS_EXCEPTIONS throw(std::bad_alloc) |