--- parser3/src/main/pa_pool.C	2001/10/18 13:18:53	1.33
+++ parser3/src/main/pa_pool.C	2001/10/19 15:27:42	1.37
@@ -4,7 +4,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_pool.C,v 1.33 2001/10/18 13:18:53 parser Exp $
+	$Id: pa_pool.C,v 1.37 2001/10/19 15:27:42 parser Exp $
 */
 
 #include "pa_pool.h"
@@ -16,7 +16,7 @@
 #endif
 
 Pool::Pool(void *astorage) : 
-	fstorage(astorage), fcontext(0), ftag(0), fexception(0)
+	fstorage(astorage), fcontext(0), ftag(0)
 #ifdef XML
 	, transcoder(0) 
 #endif
@@ -35,13 +35,13 @@ Pool::~Pool() {
 }
 
 void Pool::fail_alloc(size_t size) const {
-	fexception->_throw(0, 0,
+	throw Exception(0, 0,
 		0,
 		"failed to allocate %u bytes", size);
 }
 
 void Pool::fail_register_cleanup() const {
-	fexception->_throw(0, 0,
+	throw Exception(0, 0,
 		0,
 		"failed to register cleanup");
 }
@@ -63,7 +63,7 @@ void Pool::update_transcoder() {
 	XMLTransService::Codes resValue;
 	transcoder=XMLPlatformUtils::fgTransService->makeNewTranscoderFor(charset->cstr(), resValue, 60);
 	if(!transcoder)
-		THROW(0, 0,
+		throw Exception(0, 0,
 			charset,
 			"unsupported encoding");
 }
@@ -87,7 +87,7 @@ const char *Pool::transcode_cstr(const X
 			error=false;
 		}
 	} catch(XMLException& e) {
-		exception()._throw(*this, 0, e);
+		Exception::convert(*this, 0, e);
 	}
 	return (const char *)dest;
 }
@@ -95,8 +95,7 @@ String& Pool::transcode(const XalanDOMSt
 	return *new(*this) String(*this, transcode_cstr(s)); 
 }
 
-/// @test who would free up result?
-XalanDOMString& Pool::transcode_buf(const char *buf, size_t buf_size) { 
+std::auto_ptr<XalanDOMString> Pool::transcode_buf(const char *buf, size_t buf_size) { 
 	update_transcoder();
 
 	unsigned int dest_size=0;
@@ -116,12 +115,13 @@ XalanDOMString& Pool::transcode_buf(cons
 			result=new XalanDOMString(dest, dest_size);
 		}
 	} catch(XMLException& e) {
-		exception()._throw(*this, 0, e);
+		Exception::convert(*this, 0, e);
+		result=0; //calm, compiler
 	}
 	
-	return *result;
+	return std::auto_ptr<XalanDOMString>(result);
 }
-XalanDOMString& Pool::transcode(const String& s) { 
+std::auto_ptr<XalanDOMString> Pool::transcode(const String& s) { 
 	const char *cstr=s.cstr(String::UL_XML);
 
 	return transcode_buf(cstr, strlen(cstr));