Revise allocator per patch in QPID-1458; Fixes QPID-1458

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@734251 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 19 insertions, 2 deletions

diff --git a/cpp/src/qpid/InlineAllocator.h b/cpp/src/qpid/InlineAllocator.h
index bf2f570599..152c02a299 100644
--- a/cpp/src/qpid/InlineAllocator.h
+++ b/cpp/src/qpid/InlineAllocator.h
@@ -29,6 +29,10 @@
 
 namespace qpid {
 
+template <typename RequestedType, typename InlineType, typename BaseAllocator, size_t Max>
+struct InlineRebind;
+
+
 /**
  * An allocator that has inline storage for up to Max objects
  * of type BaseAllocator::value_type.
@@ -63,8 +67,7 @@ class InlineAllocator : public BaseAllocator {
 
     template<typename T1>
     struct rebind {
-        typedef typename BaseAllocator::template rebind<T1>::other BaseOther;
-        typedef InlineAllocator<BaseOther, Max> other;
+        typedef typename InlineRebind<T1, value_type, BaseAllocator, Max>::other other;
     };
 
   private:
@@ -79,6 +82,20 @@ class InlineAllocator : public BaseAllocator {
     bool allocated;
 };
 
+
+// Rebind: if RequestedType == InlineType, use the InlineAllocator,
+// otherwise, use the BaseAllocator without any inlining.
+
+template <typename RequestedType, typename InlineType, typename BaseAllocator, size_t Max>
+struct InlineRebind {
+    typedef typename BaseAllocator::template rebind<RequestedType>::other other;
+};
+
+template <typename T, typename BaseAllocator, size_t Max>
+struct InlineRebind<T, T, BaseAllocator, Max> {
+    typedef typename qpid::InlineAllocator<BaseAllocator, Max> other;
+};
+
 } // namespace qpid
 
 #endif  /*!QPID_INLINEALLOCATOR_H*/