--- parser3/src/include/pa_array.h	2003/01/23 16:08:00	1.57.2.4
+++ parser3/src/include/pa_array.h	2003/01/24 11:33:02	1.57.2.7
@@ -8,10 +8,9 @@
 #ifndef PA_ARRAY_H
 #define PA_ARRAY_H
 
-static const char* IDENT_ARRAY_Y="$Date: 2003/01/23 16:08:00 $";
+static const char* IDENT_ARRAY_Y="$Date: 2003/01/24 11:33:02 $";
 
 #include "pa_pool.h"
-//#include "pa_types.h"
 #include "pa_exception.h"
 
 template<typename T> class Array_iterator;
@@ -112,20 +111,20 @@ public:
 
 
 	/// iterate over all elements
-	template<typename I> void for_each(void callback(T, I), I info) const {
+	template<typename I> void for_each(void (*callback)(T, I), I info) const {
 		T *last=felements+fused;
 		for(T *current=felements; current<last; current++)
 			callback(*current, info);
 	}
 
 	/// iterate over all elements until condition becomes true, return that element
-	template<typename I> T *first_that(bool callback(T, I), I info) const {
+	template<typename I> T first_that(bool (*callback)(T, I), I info) const {
 		T *last=felements+fused;
 		for(T *current=felements; current<last; current++)
 			if(callback(*current, info))
 				return *current;
 
-		return 0;
+		return 0;//T(0);
 	}
 
 protected:
@@ -152,6 +151,21 @@ private: //disabled
 	Array& operator = (const Array&) { return *this; }
 };
 
+typedef smart_ptr<char> CharPtr;
+
+class Pool: public Array<CharPtr> {
+public:
+	char *malloc(size_t size) {
+		CharPtr result=CharPtr(new char[size]);
+		*this += result;
+		return result.get();
+	}
+};
+
+void *operator new(size_t size, Pool& pool) { 
+	return pool.malloc(size);
+}
+
 /// handy array iterator
 template<typename T> class Array_iterator {