From 810567a7384728e7a3443d9ff82fd1f1a4a55d27 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 6 Sep 2022 11:57:26 +0200 Subject: [PATCH] zipios: [skip ci] remove deprecated header --- src/zipios++/meta-iostreams.h | 5 ----- src/zipios++/zipinputstreambuf.cpp | 6 +++--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/zipios++/meta-iostreams.h b/src/zipios++/meta-iostreams.h index 53ac302c28..cb4f0a1401 100644 --- a/src/zipios++/meta-iostreams.h +++ b/src/zipios++/meta-iostreams.h @@ -7,12 +7,7 @@ #include #include - -#if defined (HAVE_STD_IOSTREAM) && defined (USE_STD_IOSTREAM) #include -#else -#include -#endif #endif diff --git a/src/zipios++/zipinputstreambuf.cpp b/src/zipios++/zipinputstreambuf.cpp index 7294a4505f..5d7f9441e9 100644 --- a/src/zipios++/zipinputstreambuf.cpp +++ b/src/zipios++/zipinputstreambuf.cpp @@ -20,7 +20,7 @@ ZipInputStreambuf::ZipInputStreambuf( streambuf *inbuf, int s_pos, bool del_inbu _open_entry( false ) { ConstEntryPointer entry = getNextEntry() ; - + if ( ! entry->isValid() ) { ; // FIXME: throw something? } @@ -51,11 +51,11 @@ ConstEntryPointer ZipInputStreambuf::getNextEntry() { is.exceptions(istream::eofbit | istream::failbit | istream::badbit); is >> _curr_entry ; if ( _curr_entry.isValid() ) { - _data_start = _inbuf->pubseekoff(0, ios::cur, + _data_start = _inbuf->pubseekoff(0, ios::cur, ios::in); if ( _curr_entry.getMethod() == DEFLATED ) { _open_entry = true ; - reset() ; // reset inflatestream data structures + reset() ; // reset inflatestream data structures // cerr << "deflated" << endl ; } else if ( _curr_entry.getMethod() == STORED ) { _open_entry = true ;