X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/72a7c55982140a7e296346e92f66a21d3f741537..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/stdstream.h?ds=sidebyside diff --git a/include/wx/stdstream.h b/include/wx/stdstream.h index 993c1eae73..27d48d5c8b 100644 --- a/include/wx/stdstream.h +++ b/include/wx/stdstream.h @@ -14,11 +14,11 @@ #include "wx/defs.h" // wxUSE_STD_IOSTREAM -#if wxUSE_STD_IOSTREAM +#if wxUSE_STREAMS && wxUSE_STD_IOSTREAM -#include -#include -#include +#include "wx/defs.h" +#include "wx/stream.h" +#include "wx/ioswrap.h" // ========================================================================== // wxStdInputStreamBuffer @@ -47,6 +47,18 @@ protected: virtual int uflow(); virtual int pbackfail(int c = EOF); + // Special work around for VC8/9 (this bug was fixed in VC10 and later): + // these versions have non-standard _Xsgetn_s() that it being called from + // the stream code instead of xsgetn() and so our overridden implementation + // never actually gets used. To work around this, forward to it explicitly. +#if defined(__VISUALC8__) || defined(__VISUALC9__) + virtual std::streamsize + _Xsgetn_s(char *s, size_t WXUNUSED(size), std::streamsize n) + { + return xsgetn(s, n); + } +#endif // VC8 or VC9 + wxInputStream& m_stream; int m_lastChar; }; @@ -106,6 +118,6 @@ protected: wxStdOutputStreamBuffer m_streamBuffer; }; -#endif // wxUSE_STD_IOSTREAM +#endif // wxUSE_STREAMS && wxUSE_STD_IOSTREAM #endif // _WX_STDSTREAM_H_