math: Move lerp function into SGMisc.

[simgear.git] / simgear / misc / zfstream.hxx

diff --git a/simgear/misc/zfstream.hxx b/simgear/misc/zfstream.hxx
index b6c0715ba1d73315e093773113c4a7d18d21d9c0..a9f065eaab29df7f94b73f8087295ba836752281 100644 (file)
--- a/simgear/misc/zfstream.hxx
+++ b/simgear/misc/zfstream.hxx
@@ -50,11 +50,13 @@
  * A C++ I/O streams interface to the zlib gz* functions.
  */
 #ifdef SG_NEED_STREAMBUF_HACK
-class gzfilebuf : public __streambuf
+class gzfilebuf : public __streambuf {
+    typedef __streambuf parent;
 #else
-class gzfilebuf : public std::streambuf
+class gzfilebuf : public std::streambuf {
+    typedef std::streambuf parent;
 #endif
-{
+
 public:
     /** Constructor */
     gzfilebuf();
@@ -88,7 +90,7 @@ public:
     bool is_open() const { return (file != NULL); }
 
     /** @return stream position */
-    virtual std::streampos seekoff( std::streamoff off, ios_seekdir way, int which );
+    virtual std::streampos seekoff( std::streamoff off, ios_seekdir way, ios_openmode which );
 
     /** sync the stream */
     virtual int sync();
@@ -97,7 +99,7 @@ protected:
 
     virtual int_type underflow();
 
-    virtual int_type overflow( int_type c = traits_type::eof() );
+    virtual int_type overflow( int_type c = parent::traits_type::eof() );
 private:
 
     int_type flushbuf();