--- parser3/src/include/pa_pool.h	2001/03/23 19:25:15	1.43
+++ parser3/src/include/pa_pool.h	2001/04/04 10:50:34	1.49
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_pool.h,v 1.43 2001/03/23 19:25:15 paf Exp $
+	$Id: pa_pool.h,v 1.49 2001/04/04 10:50:34 paf Exp $
 */
 
 #ifndef PA_POOL_H
@@ -30,11 +30,14 @@ class Pool {
 	friend Temp_exception;
 public:
 
-	Pool(void *astorage) : fstorage(astorage), fcontext(0), fexception(0) {}
+	Pool(void *astorage) : fstorage(astorage), fcontext(0), ftag(0), fexception(0) {}
 
 	void set_context(void *acontext) { fcontext=acontext; }
 	void *context() { return fcontext; }
 
+	void set_tag(void *atag) { ftag=atag; }
+	void *tag() { return ftag; }
+
 	/// current exception object of the pool
 	Exception& exception() const { return *fexception; }
 
@@ -51,6 +54,7 @@ private:
 
 	void *fstorage;
 	void *fcontext;
+	void *ftag;
 
 private: // implementation defined
 
@@ -74,7 +78,7 @@ private:
 
 private: // exception handling
 
-	// exception replacement mechanism is 'protected' from direct usage
+	// exception replacement mechanism is 'private'zed from direct usage
 	// Temp_exception object enforces paired set/restore
 	Exception *set_exception(Exception *e){
 		Exception *r=fexception;
@@ -105,7 +109,7 @@ 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
@@ -113,18 +117,23 @@ public:
 		return apool.malloc(size);
 	}
 
-	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(); }
+	Exception& exception() const { return fpool->exception(); }
 };
 /// useful macro for creating objects on current Pooled object Pooled::pool()
 #define NEW new(pool())
@@ -187,8 +196,6 @@ public:
 #define PTHROW XTHROW(pool.exception())
 #define PCATCH(e) XCATCH(e)
 #define PEND_CATCH XEND_CATCH 
-
-#define RTHROW XTHROW(r.pool().exception())
 //@}
 
 #endif