From 1502c66918a39a5a0781b3adaf9bc81c8f5fda72 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 19 Oct 2013 00:12:56 +0200 Subject: Fix build errors with clang 3.3 and c++11 enabled. (bzr r12701) --- src/io/xsltstream.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'src/io/xsltstream.cpp') diff --git a/src/io/xsltstream.cpp b/src/io/xsltstream.cpp index 7a6632233..531647769 100644 --- a/src/io/xsltstream.cpp +++ b/src/io/xsltstream.cpp @@ -30,7 +30,7 @@ namespace IO * */ XsltStyleSheet::XsltStyleSheet(InputStream &xsltSource) - throw (StreamException) + : stylesheet(NULL) { if (!read(xsltSource)) { @@ -86,7 +86,6 @@ XsltStyleSheet::~XsltStyleSheet() * */ XsltInputStream::XsltInputStream(InputStream &xmlSource, XsltStyleSheet &sheet) - throw (StreamException) : BasicInputStream(xmlSource), stylesheet(sheet) { //Load the data @@ -110,7 +109,7 @@ XsltInputStream::XsltInputStream(InputStream &xmlSource, XsltStyleSheet &sheet) /** * */ -XsltInputStream::~XsltInputStream() throw (StreamException) +XsltInputStream::~XsltInputStream() { xmlFree(outbuf); } @@ -120,7 +119,7 @@ XsltInputStream::~XsltInputStream() throw (StreamException) * this input stream without blocking by the next caller of a method for * this input stream. */ -int XsltInputStream::available() throw (StreamException) +int XsltInputStream::available() { return outsize - outpos; } @@ -130,7 +129,7 @@ int XsltInputStream::available() throw (StreamException) * Closes this input stream and releases any system resources * associated with the stream. */ -void XsltInputStream::close() throw (StreamException) +void XsltInputStream::close() { closed = true; } @@ -138,7 +137,7 @@ void XsltInputStream::close() throw (StreamException) /** * Reads the next byte of data from the input stream. -1 if EOF */ -int XsltInputStream::get() throw (StreamException) +int XsltInputStream::get() { if (closed) return -1; @@ -161,7 +160,6 @@ int XsltInputStream::get() throw (StreamException) * */ XsltOutputStream::XsltOutputStream(OutputStream &dest, XsltStyleSheet &sheet) - throw (StreamException) : BasicOutputStream(dest), stylesheet(sheet) { flushed = false; @@ -170,7 +168,7 @@ XsltOutputStream::XsltOutputStream(OutputStream &dest, XsltStyleSheet &sheet) /** * */ -XsltOutputStream::~XsltOutputStream() throw (StreamException) +XsltOutputStream::~XsltOutputStream() { //do not automatically close } @@ -179,7 +177,7 @@ XsltOutputStream::~XsltOutputStream() throw (StreamException) * Closes this output stream and releases any system resources * associated with this stream. */ -void XsltOutputStream::close() throw (StreamException) +void XsltOutputStream::close() { flush(); destination.close(); @@ -189,7 +187,7 @@ void XsltOutputStream::close() throw (StreamException) * Flushes this output stream and forces any buffered output * bytes to be written out. */ -void XsltOutputStream::flush() throw (StreamException) +void XsltOutputStream::flush() { if (flushed) { @@ -230,7 +228,7 @@ void XsltOutputStream::flush() throw (StreamException) /** * Writes the specified byte to this output stream. */ -int XsltOutputStream::put(gunichar ch) throw (StreamException) +int XsltOutputStream::put(gunichar ch) { outbuf.push_back(ch); return 1; -- cgit v1.2.3