X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..cb0b7b7d811356f729315fc14c7e0d311f43384d:/src/common/execcmn.cpp?ds=sidebyside diff --git a/src/common/execcmn.cpp b/src/common/execcmn.cpp index 9e9012f244..a84c6d10f0 100644 --- a/src/common/execcmn.cpp +++ b/src/common/execcmn.cpp @@ -16,7 +16,7 @@ // this file should never be compiled directly, just included by other code #ifndef _WX_USED_BY_WXEXECUTE_ - #error "Please don't exclude this file from build!" + #error "You should never directly build this file!" #endif // ---------------------------------------------------------------------------- @@ -65,6 +65,8 @@ private: // the size of the buffer size_t m_size; + + DECLARE_NO_COPY_CLASS(wxStreamTempInputBuffer) }; inline wxStreamTempInputBuffer::wxStreamTempInputBuffer() @@ -79,13 +81,17 @@ inline void wxStreamTempInputBuffer::Init(wxPipeInputStream *stream) m_stream = stream; } +inline void wxStreamTempInputBuffer::Update() { if ( m_stream && m_stream->CanRead() ) { // realloc in blocks of 4Kb: this is the default (and minimal) buffer // size of the Unix pipes so it should be the optimal step - static const size_t incSize = 4096; + // + // NB: don't use "static int" in this inline function, some compilers + // (e.g. IBM xlC) don't like it + enum { incSize = 4096 }; void *buf = realloc(m_buffer, m_size + incSize); if ( !buf ) @@ -102,6 +108,7 @@ void wxStreamTempInputBuffer::Update() } } +inline wxStreamTempInputBuffer::~wxStreamTempInputBuffer() { if ( m_buffer )