diff --git a/Foundation/include/Poco/DeflatingStream.h b/Foundation/include/Poco/DeflatingStream.h index b656163c0..4502652fd 100644 --- a/Foundation/include/Poco/DeflatingStream.h +++ b/Foundation/include/Poco/DeflatingStream.h @@ -176,7 +176,7 @@ protected: }; -class Foundation_API DeflatingInputStream: public DeflatingIOS, public std::istream +class Foundation_API DeflatingInputStream: public std::istream, public DeflatingIOS /// This stream compresses all data passing through it /// using zlib's deflate algorithm. { diff --git a/Foundation/include/Poco/InflatingStream.h b/Foundation/include/Poco/InflatingStream.h index 66a42b1bc..7f34650cc 100644 --- a/Foundation/include/Poco/InflatingStream.h +++ b/Foundation/include/Poco/InflatingStream.h @@ -173,7 +173,7 @@ public: }; -class Foundation_API InflatingInputStream: public InflatingIOS, public std::istream +class Foundation_API InflatingInputStream: public std::istream, public InflatingIOS /// This stream decompresses all data passing through it /// using zlib's inflate algorithm. /// Example: diff --git a/Foundation/src/DeflatingStream.cpp b/Foundation/src/DeflatingStream.cpp index 56d7b9146..e68b7ea1e 100644 --- a/Foundation/src/DeflatingStream.cpp +++ b/Foundation/src/DeflatingStream.cpp @@ -334,15 +334,15 @@ DeflatingStreamBuf* DeflatingIOS::rdbuf() DeflatingOutputStream::DeflatingOutputStream(std::ostream& ostr, DeflatingStreamBuf::StreamType type, int level): - DeflatingIOS(ostr, type, level), - std::ostream(&_buf) + std::ostream(&_buf), + DeflatingIOS(ostr, type, level) { } DeflatingOutputStream::DeflatingOutputStream(std::ostream& ostr, int windowBits, int level): - DeflatingIOS(ostr, windowBits, level), - std::ostream(&_buf) + std::ostream(&_buf), + DeflatingIOS(ostr, windowBits, level) { } @@ -365,15 +365,15 @@ int DeflatingOutputStream::sync() DeflatingInputStream::DeflatingInputStream(std::istream& istr, DeflatingStreamBuf::StreamType type, int level): - DeflatingIOS(istr, type, level), - std::istream(&_buf) + std::istream(&_buf), + DeflatingIOS(istr, type, level) { } DeflatingInputStream::DeflatingInputStream(std::istream& istr, int windowBits, int level): - DeflatingIOS(istr, windowBits, level), - std::istream(&_buf) + std::istream(&_buf), + DeflatingIOS(istr, windowBits, level) { } diff --git a/Foundation/src/InflatingStream.cpp b/Foundation/src/InflatingStream.cpp index 1eac3fa1a..274c3b79c 100644 --- a/Foundation/src/InflatingStream.cpp +++ b/Foundation/src/InflatingStream.cpp @@ -309,15 +309,15 @@ InflatingStreamBuf* InflatingIOS::rdbuf() InflatingOutputStream::InflatingOutputStream(std::ostream& ostr, InflatingStreamBuf::StreamType type): - InflatingIOS(ostr, type), - std::ostream(&_buf) + std::ostream(&_buf), + InflatingIOS(ostr, type) { } InflatingOutputStream::InflatingOutputStream(std::ostream& ostr, int windowBits): - InflatingIOS(ostr, windowBits), - std::ostream(&_buf) + std::ostream(&_buf), + InflatingIOS(ostr, windowBits) { } @@ -334,15 +334,15 @@ int InflatingOutputStream::close() InflatingInputStream::InflatingInputStream(std::istream& istr, InflatingStreamBuf::StreamType type): - InflatingIOS(istr, type), - std::istream(&_buf) + std::istream(&_buf), + InflatingIOS(istr, type) { } InflatingInputStream::InflatingInputStream(std::istream& istr, int windowBits): - InflatingIOS(istr, windowBits), - std::istream(&_buf) + std::istream(&_buf), + InflatingIOS(istr, windowBits) { }