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

applied patch 430835 (missing wxSTD breaking compilation for VC++ 5)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-06-09 17:57:06 +00:00
parent 4c5032ccd1
commit 478e6b717c
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/memory.h
View File

@@ -233,8 +233,8 @@ protected:
static int debugLevel; static int debugLevel;
static bool debugOn; static bool debugOn;
static int m_balign; // byte alignment static int m_balign; // byte alignment
static int m_balignmask; // mask for performing byte alignment static int m_balignmask; // mask for performing byte alignment
public: public:
// Set a checkpoint to dump only the memory from // Set a checkpoint to dump only the memory from
// a given point // a given point
@@ -246,7 +246,7 @@ public:
static bool HasStream(void) { return (m_debugStream != NULL); }; static bool HasStream(void) { return (m_debugStream != NULL); };
static wxSTD ostream& GetStream(void) { return *m_debugStream; } static wxSTD ostream& GetStream(void) { return *m_debugStream; }
static wxSTD streambuf *GetStreamBuf(void) { return m_streamBuf; } static wxSTD streambuf *GetStreamBuf(void) { return m_streamBuf; }
static void SetStream(wxSTD ostream *stream, streambuf *buf = NULL); static void SetStream(wxSTD ostream *stream, wxSTD streambuf *buf = NULL);
static bool SetFile(const wxString& file); static bool SetFile(const wxString& file);
static bool SetStandardError(void); static bool SetStandardError(void);

16
src/common/memory.cpp
View File

@@ -494,7 +494,7 @@ wxDebugContext::~wxDebugContext(void)
* between SetFile and SetStream. * between SetFile and SetStream.
*/ */
void wxDebugContext::SetStream(wxSTD ostream *str, streambuf *buf) void wxDebugContext::SetStream(wxSTD ostream *str, wxSTD streambuf *buf)
{ {
if (m_debugStream) if (m_debugStream)
{ {
@@ -508,7 +508,7 @@ void wxDebugContext::SetStream(wxSTD ostream *str, streambuf *buf)
#ifndef __WATCOMC__ #ifndef __WATCOMC__
if (m_streamBuf) if (m_streamBuf)
{ {
streambuf* oldBuf = m_streamBuf; wxSTD streambuf* oldBuf = m_streamBuf;
m_streamBuf = NULL; m_streamBuf = NULL;
delete oldBuf; delete oldBuf;
} }
@@ -615,13 +615,13 @@ size_t wxDebugContext::PaddedSize (const size_t size)
{ {
// Added by Terry Farnham <TJRT@pacbell.net> to replace // Added by Terry Farnham <TJRT@pacbell.net> to replace
// slow GetPadding call. // slow GetPadding call.
int padb; int padb;
padb = size & m_balignmask; padb = size & m_balignmask;
if(padb) if(padb)
return(size + m_balign - padb); return(size + m_balign - padb);
else else
return(size); return(size);
// Old (slow) code // Old (slow) code
#if 0 #if 0