diff options
| author | trav90 <travawine@openmailbox.org> | 2018-03-04 15:12:03 -0600 |
|---|---|---|
| committer | trav90 <travawine@openmailbox.org> | 2018-03-04 15:12:03 -0600 |
| commit | 45378506119d9d2f851856d46ca86652d229b68e (patch) | |
| tree | 159eb99073c6f47a2d8209e79eafeba7f3c62446 /memory | |
| parent | b9bb9f4cc643bf2285ee8396cb82bcc86ddfa693 (diff) | |
| download | uxp-45378506119d9d2f851856d46ca86652d229b68e.tar.gz | |
Use |noexcept| instead of an exception-specification in mozalloc.h
We are using |throw(std::bad_alloc)|, but dynamic exception specifications have been deprecated in C++11. The C++11 equivalent is |noexcept(false)|. This causes build warning spam when using newer compilers such as 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 f7ddb7e6d3..18752a7987 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) |