--- parser3/src/main/Attic/pa_hash.C	2001/01/29 20:10:32	1.8
+++ parser3/src/main/Attic/pa_hash.C	2001/02/20 18:45:53	1.12
@@ -1,5 +1,5 @@
 /*
-  $Id: pa_hash.C,v 1.8 2001/01/29 20:10:32 paf Exp $
+  $Id: pa_hash.C,v 1.12 2001/02/20 18:45:53 paf Exp $
 */
 
 /*
@@ -10,7 +10,7 @@
 	For more information about Zend please visit http://www.zend.com/
 */
 
-#include "pa_pool.h"
+#include "pa_hash.h"
 #include "pa_threads.h"
 
 void *Hash::Pair::operator new(size_t size, Pool& apool) {
@@ -26,18 +26,15 @@ uint Hash::sizes[]={
 int Hash::sizes_count=
 	sizeof(sizes)/sizeof(uint);
 
-void *Hash::operator new(size_t size, Pool& apool) {
-	return apool.malloc(size);
-}
 
 Hash::Hash(Pool& apool, bool athread_safe) :
-	pool(apool),
+	Pooled(apool),
 	thread_safe(athread_safe) {
 	
 	size=sizes[size_index=0];
 	threshold=size*THRESHOLD_PERCENT/100;
 	used=0;
-	refs=static_cast<Pair **>(pool.calloc(sizeof(Pair *)*size));
+	refs=static_cast<Pair **>(pool().calloc(sizeof(Pair *)*size));
 }
 
 void Hash::expand() {
@@ -47,7 +44,7 @@ void Hash::expand() {
 	// allocated bigger refs array
 	size_index=size_index+1<sizes_count?size_index+1:sizes_count-1;
 	size=sizes[size_index];
-	refs=static_cast<Pair **>(pool.calloc(sizeof(Pair *)*size));
+	refs=static_cast<Pair **>(pool().calloc(sizeof(Pair *)*size));
 
 	// rehash
 	Pair **old_ref=old_refs;
@@ -64,9 +61,9 @@ void Hash::expand() {
 		}
 }
 
-uint Hash::generic_code(uint aresult, char *start, uint size) {
+uint Hash::generic_code(uint aresult, const char *start, uint size) {
 	uint result=aresult, g;
-	char *end=start+size;
+	const char *end=start+size;
 
 	while (start<end) {
 		result=(result<<4)+*start++;
@@ -78,7 +75,7 @@ uint Hash::generic_code(uint aresult, ch
 	return result;
 }
 
-void Hash::put(Key& key, Value *value) {  SYNCHRONIZED(thread_safe);
+void Hash::put(const Key& key, Value *value) {  SYNCHRONIZED(thread_safe);
 	if(full()) 
 		expand();
 
@@ -93,10 +90,10 @@ void Hash::put(Key& key, Value *value) {
 		}
 	
 	// proper pair not found -- create&link_in new pair
-	*ref=new(pool) Pair(code, key, value, *ref);
+	*ref=new(pool()) Pair(code, key, value, *ref);
 }
 
-Hash::Value *Hash::get(Key& key) {  SYNCHRONIZED(thread_safe);
+Hash::Value *Hash::get(const Key& key) {  SYNCHRONIZED(thread_safe);
 	uint code=key.hash_code();
 	uint index=code%size;
 	for(Pair *pair=refs[index]; pair; pair=pair->link)