--- parser3/src/main/Attic/pa_array.C	2001/01/30 13:07:31	1.12
+++ parser3/src/main/Attic/pa_array.C	2001/02/20 18:45:52	1.14
@@ -1,20 +1,17 @@
 /*
-  $Id: pa_array.C,v 1.12 2001/01/30 13:07:31 paf Exp $
+  $Id: pa_array.C,v 1.14 2001/02/20 18:45:52 paf Exp $
 */
 
 #include <string.h>
 
 #include "pa_pool.h"
 #include "pa_array.h"
-
-void *Array::operator new(size_t size, Pool& apool) {
-	return apool.malloc(size);
-}
+#include "pa_exception.h"
 
 Array::Array(Pool& apool, int initial_rows) :
-	pool(apool) {
+	Pooled(apool) {
 	head=tail=static_cast<Chunk *>(
-		pool.malloc(sizeof(int)+sizeof(Chunk::Row)*initial_rows+sizeof(Chunk *)));
+		pool().malloc(sizeof(int)+sizeof(Chunk::Row)*initial_rows+sizeof(Chunk *)));
 	head->count=initial_rows;
 	append_here=head->rows;
 	link_row=&head->rows[initial_rows];
@@ -27,7 +24,7 @@ Array::Array(Pool& apool, int initial_ro
 
 void Array::expand(int chunk_rows) {
 	Chunk *chunk=tail=static_cast<Chunk *>(
-		pool.malloc(sizeof(int)+sizeof(Chunk::Row)*chunk_rows+sizeof(Chunk *)));
+		pool().malloc(sizeof(int)+sizeof(Chunk::Row)*chunk_rows+sizeof(Chunk *)));
 	chunk->count=chunk_rows;
 	link_row->link=chunk;
 	append_here=chunk->rows;
@@ -48,7 +45,7 @@ Array& Array::operator += (const Item *s
 
 const Array::Item *Array::get(int index) const {
 	if(!(index>=0 && index<size())) {
-		pool.exception().raise(0, 0, 0, 
+		pool().exception().raise(0, 0, 0, 
 			"Array::get(%d) out of range [0..%d]", index, size()-1);
 		return 0;
 	}