--- parser3/src/include/pa_pool.h	2001/03/26 08:27:25	1.45
+++ parser3/src/include/pa_pool.h	2001/09/15 11:48:41	1.53
@@ -5,13 +5,13 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_pool.h,v 1.45 2001/03/26 08:27:25 paf Exp $
+	$Id: pa_pool.h,v 1.53 2001/09/15 11:48:41 parser Exp $
 */
 
 #ifndef PA_POOL_H
 #define PA_POOL_H
 
-#include <stddef.h>
+#include "pa_config_includes.h"
 
 class Exception;
 class Temp_exception;
@@ -38,28 +38,34 @@ public:
 	void set_tag(void *atag) { ftag=atag; }
 	void *tag() { return ftag; }
 
-	/// current exception object of the pool
-	Exception& exception() const { return *fexception; }
-
 	/// allocates some bytes on pool
-	void *malloc(size_t size) {
-		return check(real_malloc(size), size);
+	void *malloc(size_t size/*, int place=0*/) {
+		return check(real_malloc(size/*, place*/), size);
 	}
 	/// allocates some bytes clearing them with zeros
 	void *calloc(size_t size) {
 		return check(real_calloc(size), size);
 	}
 
+	/// registers a routine to clean up non-pooled allocations
+	void register_cleanup(void (*cleanup) (void *), void *data);
+
+	/// current exception object of the pool
+	Exception& exception() const { return *fexception; }
+
 private:
 
 	void *fstorage;
 	void *fcontext;
 	void *ftag;
 
-private: // implementation defined
-
-    void *real_malloc(size_t size);
+private: 
+	
+	//{
+	/// @name implementation defined
+    void *real_malloc(size_t size/*, int place*/);
     void *real_calloc(size_t size);
+	//}
 
 private: 
 
@@ -109,26 +115,35 @@ private: //disabled
 */
 class Pooled {
 	// the pool i'm allocated on
-	Pool& fpool;
+	Pool *fpool;
 public:
 
 	/// the Pooled-sole: Pooled instances can be allocated in Pool rather then on heap
 	static void *operator new(size_t size, Pool& apool) { 
-		return apool.malloc(size);
+		return apool.malloc(size/*, 1*/);
 	}
 
-	Pooled(Pool& apool) : fpool(apool) {
-	}
+	Pooled(Pool& apool) : fpool(&apool) {}
 
 	/// my pool
-	Pool& pool() const { return fpool; }
+	Pool& pool() const { return *fpool; }
+
+	/** used for moving objects from one pool to another. 
+		in between object can have no pool and can not be used
+		@see SQL_Driver_manager
+	*/
+	void set_pool(Pool *apool) { fpool=apool; }
 
 	/// useful wrapper around pool
-	void *malloc(size_t size) const { return fpool.malloc(size); }
+	void *malloc(size_t size) const { return fpool->malloc(size); }
 	/// useful wrapper around pool
-	void *calloc(size_t size) const { return fpool.calloc(size); }
+	void *calloc(size_t size) const { return fpool->calloc(size); }
 	/// useful wrapper around pool
-	Exception& exception() const { return fpool.exception(); }
+	void register_cleanup(void (*cleanup) (void *), void *data) { 
+		fpool->register_cleanup(cleanup, data);
+	}
+	/// useful wrapper around pool
+	Exception& exception() const { return fpool->exception(); }
 };
 /// useful macro for creating objects on current Pooled object Pooled::pool()
 #define NEW new(pool())
@@ -191,8 +206,6 @@ public:
 #define PTHROW XTHROW(pool.exception())
 #define PCATCH(e) XCATCH(e)
 #define PEND_CATCH XEND_CATCH 
-
-#define RTHROW XTHROW(r.pool().exception())
 //@}
 
 #endif