--- parser3/src/include/pa_cache_managers.h	2001/11/08 14:47:31	1.2
+++ parser3/src/include/pa_cache_managers.h	2003/11/20 17:07:44	1.13
@@ -1,45 +1,40 @@
 /** @file
 	Parser: cache managers center decl.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_cache_managers.h,v 1.2 2001/11/08 14:47:31 paf Exp $
+	$Date: 2003/11/20 17:07:44 $
 */
 
 #ifndef PA_CACHE_MANAGERS_H
 #define PA_CACHE_MANAGERS_H
 
-#include "pa_config_includes.h"
+static const char * const IDENT_CACHE_MANAGERS_H="$Date: 2003/11/20 17:07:44 $";
+
 #include "pa_hash.h"
 #include "pa_value.h"
 
 // defines
 
-// forwards
+/// can return status and can expire it contents
+class Cache_manager: public PA_Object {
+public:
+	/// if filter_server_id not null, returns status only Cachable -s with matching cacheable_item_server_id()
+	virtual Value* get_status() =0;
+	virtual void maybe_expire_cache() {}
+	virtual ~Cache_manager() {}
+};
 
 /// maintains name=>Cache_manager association, can expire its contents
-class Cache_managers : public Hash {
+class Cache_managers: public Hash<const String::Body, Cache_manager*> {
 public:
-	Cache_managers(Pool& apool) : Hash(apool) {
-	}
-
 	/// maybe-expires all caches it contains, each cache manager desides it itself
 	void maybe_expire();
 
 };
 
-/// can return status and can expire it contents
-class Cache_manager : public Pooled {
-public:
-	Cache_manager(Pool& apool) : Pooled(apool) {}
-
-	/// if filter_server_id not null, returns status only Cachable -s with matching cacheable_item_server_id()
-	virtual Value& get_status(Pool& pool, const String *source) =0;
-	virtual void maybe_expire_cache() {}
-};
-
 /// global
-extern Cache_managers *cache_managers;
+extern Cache_managers cache_managers;
 
 #endif