From: Sage Weil <sage@redhat.com>
Date: Tue, 15 Nov 2016 17:34:39 +0000 (-0500)
Subject: include/mempool: silence warnings
X-Git-Tag: v11.1.0~262^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ee84e78f90f6cfc3a142fe05caa2fe65665f1e8f;p=ceph.git

include/mempool: silence warnings

/home/sage/src/ceph4/src/include/mempool.h:421:68: warning: no return statement in function returning non-void [-Wreturn-type]
   void *operator new[](size_t size) { assert(0 == "no array new"); } \

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/include/mempool.h b/src/include/mempool.h
index 81d20976adfcd..431768643b943 100644
--- a/src/include/mempool.h
+++ b/src/include/mempool.h
@@ -418,10 +418,14 @@ DEFINE_MEMORY_POOLS_HELPER(P)
 //
 #define MEMPOOL_CLASS_HELPERS()						\
   void *operator new(size_t size);					\
-  void *operator new[](size_t size) { assert(0 == "no array new"); }	\
+  void *operator new[](size_t size) {					\
+    assert(0 == "no array new");					\
+    return (void*)1;							\
+  }									\
   void  operator delete(void *);					\
   void  operator delete[](void *) { assert(0 == "no array delete"); }
 
+
 // Use this in some particular .cc file to match each class with a
 // MEMPOOL_CLASS_HELPERS().
 #define MEMPOOL_DEFINE_OBJECT_FACTORY(obj,factoryname,pool)		\