--- parser3/src/include/pa_pool.h 2001/09/21 14:46:09 1.59 +++ parser3/src/include/pa_pool.h 2001/10/18 13:09:37 1.63 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_pool.h,v 1.59 2001/09/21 14:46:09 parser Exp $ + $Id: pa_pool.h,v 1.63 2001/10/18 13:09:37 parser Exp $ */ #ifndef PA_POOL_H @@ -16,7 +16,6 @@ #ifdef XML #include #include -#include #endif // forwards @@ -66,11 +65,17 @@ public: /// current exception object of the pool Exception& exception() const { return *fexception; } + /// resets transcoder if they change charset + void set_charset(const String &charset); + /// returns current charset + const String& get_charset() { return *charset; } + private: void *fstorage; void *fcontext; void *ftag; + const String *charset; private: @@ -120,16 +125,14 @@ private: #ifdef XML public: - /// resets transcoder if they change charset - void set_charset(const String &charset); - /// returns current charset - const String& get_charset() { return *charset; } /// converts Xalan string to char * const char *transcode_cstr(const XalanDOMString& s); /// converts Xalan string to parser String String& transcode(const XalanDOMString& s); - /// converts XSL exception to parser exception - void _throw(const String *source, const XSLException& e); + /// converts char * to Xalan string + XalanDOMString& Pool::transcode_buf(const char *buf, size_t buf_size); + /// converts parser String to Xalan string + XalanDOMString& Pool::transcode(const String& s); private: @@ -138,7 +141,6 @@ private: private: - const String *charset; XMLTranscoder *transcoder; #endif @@ -186,7 +188,6 @@ public: #ifdef XML const char *transcode_cstr(const XalanDOMString& s) { return fpool->transcode_cstr(s); } String& transcode(const XalanDOMString& s) { return fpool->transcode(s); } - void _throw(const String *source, const XSLException& e) { fpool->_throw(source, e); } #endif //} };