]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
include/mempool: silence warnings 12032/head
authorSage Weil <sage@redhat.com>
Tue, 15 Nov 2016 17:34:39 +0000 (12:34 -0500)
committerSage Weil <sage@redhat.com>
Wed, 16 Nov 2016 23:14:10 +0000 (17:14 -0600)
/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>
src/include/mempool.h

index 81d20976adfcdea8ddfc2a0a3cf198611f8eca47..431768643b943b64dcb939f45ce772546fdb091d 100644 (file)
@@ -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)            \