From e1fd8f19f6f4de87e20195565937f8a483cf19dc Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Wed, 16 Nov 2016 17:13:52 -0500 Subject: [PATCH] bluestore: Fix warning in pool allocator Since we're not allocating anything, we should return nullptr and mark the function noexcept. (Functions not marked noexcept are not allowed to return nullptr.) Signed-off-by: Adam C. Emerson --- src/include/mempool.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/include/mempool.h b/src/include/mempool.h index 431768643b9..dba6b559cd7 100644 --- a/src/include/mempool.h +++ b/src/include/mempool.h @@ -418,10 +418,9 @@ DEFINE_MEMORY_POOLS_HELPER(P) // #define MEMPOOL_CLASS_HELPERS() \ void *operator new(size_t size); \ - void *operator new[](size_t size) { \ + void *operator new[](size_t size) noexcept { \ assert(0 == "no array new"); \ - return (void*)1; \ - } \ + return nullptr; } \ void operator delete(void *); \ void operator delete[](void *) { assert(0 == "no array delete"); } -- 2.39.5