additional changes for #1499: fix warnings and be consistent with base class order

This commit is contained in:
Guenter Obiltschnig
2016-11-28 00:23:05 +01:00
parent 75a7ee4b0f
commit 84e0905b6f
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: