X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17a1ebd101f0653e69736416a2a28d0ada423141..e3e89a9370cf895877feb84820c26bdc2e6ed588:/src/common/mstream.cpp?ds=sidebyside diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp index 4f1886eaee..f778677728 100644 --- a/src/common/mstream.cpp +++ b/src/common/mstream.cpp @@ -21,15 +21,19 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif #if wxUSE_STREAMS -#include -#include "wx/stream.h" #include "wx/mstream.h" +#ifndef WX_PRECOMP + #include "wx/stream.h" +#endif //WX_PRECOMP + +#include + // ============================================================================ // implementation // ============================================================================ @@ -59,7 +63,7 @@ wxMemoryInputStream::wxMemoryInputStream(const wxMemoryOutputStream& stream) } const size_t len = wx_truncate_cast(size_t, lenFile); - wxASSERT_MSG( len == lenFile, _T("huge files not supported") ); + wxASSERT_MSG( len == lenFile + size_t(0), _T("huge files not supported") ); m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read); m_i_streambuf->SetBufferIO(len); // create buffer @@ -88,11 +92,6 @@ char wxMemoryInputStream::Peek() return buf[pos]; } -bool wxMemoryInputStream::Eof() const -{ - return !m_i_streambuf->GetBytesLeft(); -} - size_t wxMemoryInputStream::OnSysRead(void *buffer, size_t nbytes) { size_t pos = m_i_streambuf->GetIntPosition();