From 1a558a30bec496444742ed75c0a6973d9789daf7 Mon Sep 17 00:00:00 2001
From: Tim King <taking@cs.nyu.edu>
Date: Mon, 2 Apr 2012 20:56:55 +0000
Subject: - Merged in the branch cdlist-cleanup. - This adds a CleanUp template
 argument to CDList. - CDChunkList<T> replaces the CDList specialization for
 ContextMemoryAllocator. - CDVector<T> has been simplified and improved. - The
 expected performance impact is negligible.

---
 src/context/cdlist_forward.h | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'src/context/cdlist_forward.h')

diff --git a/src/context/cdlist_forward.h b/src/context/cdlist_forward.h
index 90c439085..78557afd2 100644
--- a/src/context/cdlist_forward.h
+++ b/src/context/cdlist_forward.h
@@ -41,16 +41,18 @@ namespace __gnu_cxx {
 }/* __gnu_cxx namespace */
 
 namespace CVC4 {
-  namespace context {
-    template <class T>
-    class ContextMemoryAllocator;
+namespace context {
 
-    template <class T, class Allocator = std::allocator<T> >
-    class CDList;
+template <class T>
+class DefaultCleanUp {
+public:
+  inline void operator()(T* t) const{}
+};
 
-    template <class T>
-    class CDList<T, ContextMemoryAllocator<T> >;
-  }/* CVC4::context namespace */
+template <class T, class CleanUp = DefaultCleanUp<T>, class Allocator = std::allocator<T> >
+class CDList;
+
+}/* CVC4::context namespace */
 }/* CVC4 namespace */
 
 #endif /* __CVC4__CONTEXT__CDLIST_FORWARD_H */
-- 
cgit v1.2.3