Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applied patch for compilation with gcc 3.0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-06-06 16:51:53 +00:00
parent 014e19de74
commit dd107c50be
30 changed files with 146 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/memory.cpp
View File

@@ -461,12 +461,12 @@ int wxMemStruct::ValidateNode ()
wxMemStruct *wxDebugContext::m_head = NULL;
wxMemStruct *wxDebugContext::m_tail = NULL;
// ostream *wxDebugContext::m_debugStream = NULL;
// streambuf *wxDebugContext::m_streamBuf = NULL;
// wxSTD ostream *wxDebugContext::m_debugStream = NULL;
// wxSTD streambuf *wxDebugContext::m_streamBuf = NULL;
// Must initialise these in wxEntry, and then delete them just before wxEntry exits
streambuf *wxDebugContext::m_streamBuf = NULL;
ostream *wxDebugContext::m_debugStream = NULL;
wxSTD streambuf *wxDebugContext::m_streamBuf = NULL;
wxSTD ostream *wxDebugContext::m_debugStream = NULL;
bool wxDebugContext::m_checkPrevious = FALSE;
int wxDebugContext::debugLevel = 1;
@@ -481,7 +481,7 @@ int wxDebugContext::m_balignmask = (int)((char *)&markerCalc[1] - (char*)&marker
wxDebugContext::wxDebugContext(void)
{
// m_streamBuf = new wxDebugStreamBuf;
// m_debugStream = new ostream(m_streamBuf);
// m_debugStream = new wxSTD ostream(m_streamBuf);
}
wxDebugContext::~wxDebugContext(void)
@@ -494,7 +494,7 @@ wxDebugContext::~wxDebugContext(void)
* between SetFile and SetStream.
*/
void wxDebugContext::SetStream(ostream *str, streambuf *buf)
void wxDebugContext::SetStream(wxSTD ostream *str, streambuf *buf)
{
if (m_debugStream)
{
@@ -519,7 +519,7 @@ void wxDebugContext::SetStream(ostream *str, streambuf *buf)
bool wxDebugContext::SetFile(const wxString& file)
{
ofstream *str = new ofstream(file.mb_str());
wxSTD ofstream *str = new wxSTD ofstream(file.mb_str());
if (str->bad())
{
@@ -539,7 +539,7 @@ bool wxDebugContext::SetStandardError(void)
#if 0
#if !defined(_WINDLL)
wxDebugStreamBuf *buf = new wxDebugStreamBuf;
ostream *stream = new ostream(m_streamBuf);
wxSTD ostream *stream = new wxSTD ostream(m_streamBuf);
SetStream(stream, buf);
return TRUE;
#else