Bug 1383919 - Use |noexcept| instead of an exception-specification in mozalloc.h. r=glandium
authorBotond Ballo <botond@mozilla.com>
Mon, 24 Jul 2017 19:19:07 -0400 (2017-07-24)
changeset 372261 ae7e3082d862ae173ef4cbe3b36f878cb853a73b
parent 372260 ee3040e6db09f6925c72bd2f492dd9289dfa7d51
child 372262 4deecfb7f7f3e2621cee5c48638ee6fcde1ed53e
push id47754
push userbballo@mozilla.com
push dateTue, 01 Aug 2017 21:11:31 +0000 (2017-08-01)
treeherderautoland@ae7e3082d862 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1383919
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1383919 - Use |noexcept| instead of an exception-specification in mozalloc.h. r=glandium MozReview-Commit-ID: DwrE8cmZOQN
memory/mozalloc/mozalloc.h
--- a/memory/mozalloc/mozalloc.h
+++ b/memory/mozalloc/mozalloc.h
@@ -170,16 +170,22 @@ MFBT_API void* moz_xvalloc(size_t size)
 #define MOZALLOC_THROW_IF_HAS_EXCEPTIONS throw()
 #define MOZALLOC_THROW_BAD_ALLOC_IF_HAS_EXCEPTIONS
 #elif defined(_MSC_VER)
 /*
  * Suppress build warning spam (bug 578546).
  */
 #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)
 #endif
 
 #define MOZALLOC_THROW_BAD_ALLOC MOZALLOC_THROW_BAD_ALLOC_IF_HAS_EXCEPTIONS
 
 MOZALLOC_EXPORT_NEW