X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2db0bbdecd8b979c00eef0276075d1e314b35d93..6e264973e636cc41915d166cb7eddf2a7e72cf9b:/include/wx/memory.h?ds=sidebyside diff --git a/include/wx/memory.h b/include/wx/memory.h index 92f28769ac..e676282b7a 100644 --- a/include/wx/memory.h +++ b/include/wx/memory.h @@ -28,15 +28,18 @@ #include +// Obsolete +#if 0 #if wxUSE_IOSTREAMH // N.B. BC++ doesn't have istream.h, ostream.h # include #else -# include +# include # if defined(__VISUALC__) || defined(__MWERKS__) - using namespace std; +// using namespace std; # endif #endif +#endif #ifdef __WXDEBUG__ @@ -227,14 +230,17 @@ protected: // Traverse the list. static void TraverseList (PmSFV, wxMemStruct *from = NULL); - static streambuf *m_streamBuf; - static ostream *m_debugStream; + // Obsolete +#if 0 + static wxSTD streambuf *m_streamBuf; + static wxSTD ostream *m_debugStream; +#endif static int debugLevel; static bool debugOn; - static int m_balign; // byte alignment - static int m_balignmask; // mask for performing byte alignment + static int m_balign; // byte alignment + static int m_balignmask; // mask for performing byte alignment public: // Set a checkpoint to dump only the memory from // a given point @@ -243,12 +249,15 @@ public: wxDebugContext(void); ~wxDebugContext(void); + // Obsolete +#if 0 static bool HasStream(void) { return (m_debugStream != NULL); }; - static ostream& GetStream(void) { return *m_debugStream; } - static streambuf *GetStreamBuf(void) { return m_streamBuf; } - static void SetStream(ostream *stream, streambuf *buf = NULL); + static wxSTD ostream& GetStream(void) { return *m_debugStream; } + static wxSTD streambuf *GetStreamBuf(void) { return m_streamBuf; } + static void SetStream(wxSTD ostream *stream, wxSTD streambuf *buf = NULL); static bool SetFile(const wxString& file); static bool SetStandardError(void); +#endif static int GetLevel(void) { return debugLevel; } static void SetLevel(int level) { debugLevel = level; }