Revert "System: Add SwapByteOrder and update Support/MathExtras.h to use it."

[oota-llvm.git] / include / llvm / Support / RecyclingAllocator.h

diff --git a/include/llvm/Support/RecyclingAllocator.h b/include/llvm/Support/RecyclingAllocator.h
index a338c0eb6397c272e9fa723dc70318eef5e2b977..34ab874778c912bc7fba98459c5fd0f189138509 100644 (file)
--- a/include/llvm/Support/RecyclingAllocator.h
+++ b/include/llvm/Support/RecyclingAllocator.h
@@ -15,21 +15,20 @@
 #ifndef LLVM_SUPPORT_RECYCLINGALLOCATOR_H
 #define LLVM_SUPPORT_RECYCLINGALLOCATOR_H
 
-#include <cassert>
 #include "llvm/Support/Recycler.h"
-#include "llvm/ADT/STLExtras.h"
 
 namespace llvm {
 
 /// RecyclingAllocator - This class wraps an Allocator, adding the
 /// functionality of recycling deleted objects.
 ///
-template<class AllocatorType, class T, class LargestT = T>
+template<class AllocatorType, class T,
+         size_t Size = sizeof(T), size_t Align = AlignOf<T>::Alignment>
 class RecyclingAllocator {
 private:
   /// Base - Implementation details.
   ///
-  Recycler<T, LargestT> Base;
+  Recycler<T, Size, Align> Base;
 
   /// Allocator - The wrapped allocator.
   ///
@@ -42,7 +41,7 @@ public:
   /// SubClass. The storage may be either newly allocated or recycled.
   ///
   template<class SubClass>
-  SubClass *Allocate() { return Base.Allocate<SubClass>(Allocator); }
+  SubClass *Allocate() { return Base.template Allocate<SubClass>(Allocator); }
 
   T *Allocate() { return Base.Allocate(Allocator); }
 
@@ -57,4 +56,18 @@ public:
 
 }
 
+template<class AllocatorType, class T, size_t Size, size_t Align>
+inline void *operator new(size_t,
+                          llvm::RecyclingAllocator<AllocatorType,
+                                                   T, Size, Align> &Allocator) {
+  return Allocator.Allocate();
+}
+
+template<class AllocatorType, class T, size_t Size, size_t Align>
+inline void operator delete(void *E,
+                            llvm::RecyclingAllocator<AllocatorType,
+                                                     T, Size, Align> &A) {
+  A.Deallocate(E);
+}
+
 #endif