diff options
Diffstat (limited to 'memory')
| -rw-r--r-- | memory/build/replace_malloc.c | 6 | ||||
| -rw-r--r-- | memory/mozalloc/mozalloc.h | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/memory/build/replace_malloc.c b/memory/build/replace_malloc.c index 88dfde33c..26dd8c2d6 100644 --- a/memory/build/replace_malloc.c +++ b/memory/build/replace_malloc.c @@ -513,6 +513,12 @@ register_zone(void) */ malloc_zone_t *purgeable_zone = malloc_default_purgeable_zone(); + // There is a problem related to the above with the system nano zone, which + // is hard to work around from here, and that is instead worked around by + // disabling the nano zone through an environment variable + // (MallocNanoZone=0). In Firefox, we do that through + // browser/app/macbuild/Contents/Info.plist.in. + /* Register the custom zone. At this point it won't be the default. */ malloc_zone_register(&zone); 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) |