--- parser3/src/main/pa_pool.C 2001/12/15 21:28:21 1.46 +++ parser3/src/main/pa_pool.C 2002/02/08 07:27:48 1.50 @@ -1,10 +1,10 @@ /** @file Parser: pool class. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://paf.design.ru) - $Id: pa_pool.C,v 1.46 2001/12/15 21:28:21 paf Exp $ + $Id: pa_pool.C,v 1.50 2002/02/08 07:27:48 paf Exp $ */ #include "pa_pool.h" @@ -13,10 +13,6 @@ #include "pa_sapi.h" #include "pa_charset.h" -#ifdef XML -#include -#endif - Pool::Pool(void *astorage) : fstorage(astorage), fcontext(0), ftotal_allocated(0), ftotal_times(0), @@ -59,15 +55,23 @@ Charset& Pool::get_client_charset() { #ifdef XML -const char *Pool::transcode_cstr(const XalanDOMString& s) { +const char *Pool::transcode_cstr(xmlChar *s) { + return get_source_charset().transcode_cstr(s); +} + +String& Pool::transcode(xmlChar *s) { + return get_source_charset().transcode(s); +} + +const char *Pool::transcode_cstr(GdomeDOMString *s) { return get_source_charset().transcode_cstr(s); } -String& Pool::transcode(const XalanDOMString& s) { +String& Pool::transcode(GdomeDOMString *s) { return get_source_charset().transcode(s); } -std::auto_ptr Pool::transcode(const String& s) { +GdomeDOMString_auto_ptr Pool::transcode(const String& s) { return get_source_charset().transcode(s); }