--- parser3/src/include/pa_array.h	2001/08/02 09:58:34	1.42
+++ parser3/src/include/pa_array.h	2001/12/15 21:28:18	1.48
@@ -2,16 +2,14 @@
 	Parser: Array & Array_iter classes decls.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: pa_array.h,v 1.42 2001/08/02 09:58:34 parser Exp $
+	$Id: pa_array.h,v 1.48 2001/12/15 21:28:18 paf Exp $
 */
 
 #ifndef PA_ARRAY_H
 #define PA_ARRAY_H
 
-#include "pa_config_includes.h"
 #include "pa_pool.h"
 #include "pa_types.h"
 #include "pa_string.h"
@@ -35,7 +33,7 @@ class Array_iter;
 */
 
 class Array : public Pooled {
-	friend Array_iter;
+	friend class Array_iter;
 public:
 
 	/// Array item type
@@ -49,10 +47,10 @@ public:
 	typedef void (*For_each_func)(Item *value, void *info);
 
 	/// first_that iterator function type, const info
-	typedef bool (*First_that_func_const)(Item *value, const void *info);
+	typedef void *(*Item_that_func_const)(Item *value, const void *info);
 
 	/// first_that iterator function type
-	typedef bool (*First_that_func)(Item *value, void *info);
+	typedef void *(*Item_that_func)(Item *value, void *info);
 
 	enum {
 		CR_INITIAL_ROWS_DEFAULT=3, ///< default preallocated row count
@@ -93,10 +91,10 @@ public:
 	void for_each(For_each_func func, void *info=0) const;
 
 	/// iterate over all elements until condition, const info
-	void* first_that(First_that_func_const func, const void *info=0) const;
+	void* first_that(Item_that_func_const func, const void *info=0) const;
 
 	/// iterate over all elements until condition
-	void* first_that(First_that_func func, void *info=0) const;
+	void* first_that(Item_that_func func, void *info=0) const;
 
 private:
 
@@ -130,9 +128,6 @@ private:
 	// array size
 	int fused_rows;
 
-	mutable int cache_chunk_base;
-	mutable Chunk *cache_chunk;
-	
 private:
 
 	bool chunk_is_full() {