diff options
Diffstat (limited to 'libcxx/src/experimental/memory_resource.cpp')
-rw-r--r-- | libcxx/src/experimental/memory_resource.cpp | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/libcxx/src/experimental/memory_resource.cpp b/libcxx/src/experimental/memory_resource.cpp index 1304ef3df78f..ffe8021514fc 100644 --- a/libcxx/src/experimental/memory_resource.cpp +++ b/libcxx/src/experimental/memory_resource.cpp @@ -40,7 +40,7 @@ class _LIBCPP_TYPE_VIS __new_delete_memory_resource_imp _VSTD::__libcpp_deallocate(p, n, align); } - bool do_is_equal(memory_resource const & other) const _NOEXCEPT override + bool do_is_equal(memory_resource const & other) const noexcept override { return &other == this; } public: @@ -60,7 +60,7 @@ protected: __throw_bad_alloc(); } virtual void do_deallocate(void *, size_t, size_t) {} - virtual bool do_is_equal(memory_resource const & __other) const _NOEXCEPT + virtual bool do_is_equal(memory_resource const & __other) const noexcept { return &__other == this; } }; @@ -76,28 +76,23 @@ union ResourceInitHelper { ~ResourceInitHelper() {} }; -// When compiled in C++14 this initialization should be a constant expression. -// Only in C++11 is "init_priority" needed to ensure initialization order. -#if _LIBCPP_STD_VER > 11 -_LIBCPP_SAFE_STATIC -#endif -ResourceInitHelper res_init _LIBCPP_INIT_PRIORITY_MAX; +_LIBCPP_SAFE_STATIC ResourceInitHelper res_init _LIBCPP_INIT_PRIORITY_MAX; } // end namespace -memory_resource * new_delete_resource() _NOEXCEPT { +memory_resource * new_delete_resource() noexcept { return &res_init.resources.new_delete_res; } -memory_resource * null_memory_resource() _NOEXCEPT { +memory_resource * null_memory_resource() noexcept { return &res_init.resources.null_res; } // default_memory_resource() static memory_resource * -__default_memory_resource(bool set = false, memory_resource * new_res = nullptr) _NOEXCEPT +__default_memory_resource(bool set = false, memory_resource * new_res = nullptr) noexcept { #ifndef _LIBCPP_HAS_NO_ATOMIC_HEADER _LIBCPP_SAFE_STATIC static atomic<memory_resource*> __res = @@ -138,12 +133,12 @@ __default_memory_resource(bool set = false, memory_resource * new_res = nullptr) #endif } -memory_resource * get_default_resource() _NOEXCEPT +memory_resource * get_default_resource() noexcept { return __default_memory_resource(); } -memory_resource * set_default_resource(memory_resource * __new_res) _NOEXCEPT +memory_resource * set_default_resource(memory_resource * __new_res) noexcept { return __default_memory_resource(true, __new_res); } |