fixed warnings and inconsistencies

This commit is contained in:
Guenter Obiltschnig 2016-12-06 22:11:54 +01:00
parent 955f409177
commit 13b062c786
4 changed files with 18 additions and 18 deletions

View File

@ -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.
{

View File

@ -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:

View File

@ -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)
{
}

View File

@ -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)
{
}