From: Sage Weil <sage@redhat.com>
Date: Wed, 9 Nov 2016 16:07:51 +0000 (-0500)
Subject: include/mempool: adjust factory name
X-Git-Tag: v11.1.0~325^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=08222300c5485c89ce1f199b9af04e49ce4e9563;p=ceph.git

include/mempool: adjust factory name

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

diff --git a/src/include/mempool.h b/src/include/mempool.h
index 6a2e2ebcc2ca..e3733f8910a4 100644
--- a/src/include/mempool.h
+++ b/src/include/mempool.h
@@ -337,7 +337,7 @@ public:
     using multimap = std::multimap<k,v,cmp,				\
 				   pool_allocator<std::pair<k,v>>>;	\
     template<typename k, typename cmp = std::less<k> >			\
-    using set = std::set<k,cmp,pool_allocator<k>>; \
+    using set = std::set<k,cmp,pool_allocator<k>>;			\
     template<typename v>						\
     using list = std::list<v,pool_allocator<v>>;			\
     template<typename v>						\
@@ -366,8 +366,11 @@ DEFINE_MEMORY_POOLS_HELPER(P)
 // Use this for any type that is contained by a container (unless it
 // is a class you defined; see below).
 #define MEMPOOL_DEFINE_FACTORY(obj, factoryname, pool)			\
-  mempool::pool::pool_allocator<obj>					\
-  _factory_##pool##factoryname##_alloc = {true};
+  namespace mempool {							\
+    namespace pool {							\
+      pool_allocator<obj> alloc_##factoryname = {true};			\
+    }									\
+  }
 
 // Use this for each class that belongs to a mempool.  For example,
 //
@@ -387,10 +390,10 @@ DEFINE_MEMORY_POOLS_HELPER(P)
 #define MEMPOOL_DEFINE_OBJECT_FACTORY(obj,factoryname,pool)		\
   MEMPOOL_DEFINE_FACTORY(obj, factoryname, pool)			\
   void *obj::operator new(size_t size) {				\
-    return _factory_##pool##factoryname##_alloc.allocate(1);		\
+    return mempool::pool::alloc_##factoryname.allocate(1); \
   }									\
   void obj::operator delete(void *p)  {					\
-    return _factory_##pool##factoryname##_alloc.deallocate((obj*)p, 1); \
+    return mempool::pool::alloc_##factoryname.deallocate((obj*)p, 1);	\
   }
 
 #endif