--- parser3/src/include/pa_charsets.h	2002/08/01 11:41:15	1.7
+++ parser3/src/include/pa_charsets.h	2003/03/18 15:14:16	1.8.2.8.2.1
@@ -1,7 +1,7 @@
 /** @file
 	Parser: sql driver manager decl.
 
-	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
 
@@ -11,21 +11,25 @@
 #ifndef PA_CHARSETS_H
 #define PA_CHARSETS_H
 
-static const char* IDENT_CHARSETS_H="$Date: 2002/08/01 11:41:15 $";
+static const char* IDENT_CHARSETS_H="$Date: 2003/03/18 15:14:16 $";
 
 #include "pa_hash.h"
+#include "pa_charset.h"
 
-class Charsets : public Hash {
+class Charsets: public Hash<String* , CharsetPtr> {
+	Pool charsets_pool;
 public:
-	Charsets(Pool& apool);
-	~Charsets();
 
-	Charset& get_charset(const String& name);
-	void load_charset(const String& request_name, const String& request_file_spec);
-};
+	Charsets();
+
+	Charset& get(const String& aname);
 
-/// global
-extern Charsets *charsets;
+	void load_charset(const String& arequest_name, const String& arequest_file_spec);
+};
 
+//@{ globals
+extern CharsetPtr UTF8_charset;
+extern Charsets charsets;
+//@}
 
 #endif