--- parser3/src/include/pa_pool.h 2002/01/10 15:41:49 1.75 +++ parser3/src/include/pa_pool.h 2002/06/18 09:51:36 1.80 @@ -1,11 +1,11 @@ /** @file Parser: pool class decl. - 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) + Author: Alexandr Petrosian (http://paf.design.ru) - $Id: pa_pool.h,v 1.75 2002/01/10 15:41:49 paf Exp $ + $Id: pa_pool.h,v 1.80 2002/06/18 09:51:36 paf Exp $ */ #ifndef PA_POOL_H @@ -15,6 +15,8 @@ #ifdef XML # include "gdome.h" +// for xmlChar +# include "libxml/tree.h" #endif // forwards @@ -36,10 +38,10 @@ public: Pool(void *astorage); - ///{@ statistics + //{@ statistics size_t total_allocated() { return ftotal_allocated; } unsigned int total_times() { return ftotal_times; } - ///}@ + //}@ void set_context(void *acontext) { fcontext=acontext; } void *get_context() { return fcontext; } @@ -59,19 +61,25 @@ public: fail_register_cleanup(); } - ///{@ source charset + //{@ source charset void set_source_charset(Charset& acharset); Charset& get_source_charset(); - ///}@ + //}@ - ///{@ client charset + //{@ client charset void set_client_charset(Charset& charset); Charset& get_client_charset(); - ///}@ + //}@ #ifdef XML + /// @see Charset::transcode_cstr(xmlChar *s); + const char *transcode_cstr(xmlChar *s); + /// @see Charset::transcode(xmlChar *s); + String& transcode(xmlChar *s); + /// @see Charset::transcode_cstr(GdomeDOMString *s); const char *transcode_cstr(GdomeDOMString *s); + /// @see Charset::transcode(GdomeDOMString *s); String& transcode(GdomeDOMString *s); /// @see Charset::transcode(const String& s) GdomeDOMString_auto_ptr transcode(const String& s); @@ -133,6 +141,10 @@ private: //disabled @see NEW */ + +// all classes that are members parents of packed class [String] +// sould be packed also to avoid sparc odd st/lduh problem +#include "pa_pragma_pack_begin.h" class Pooled { // the pool i'm allocated on Pool *fpool; @@ -167,6 +179,7 @@ public: #endif //} }; +#include "pa_pragma_pack_end.h" /// useful macro for creating objects on current Pooled object Pooled::pool() #define NEW new(pool())