From 478e6b717c8cdbb35d993d5224895a0663c36bd1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 9 Jun 2001 17:57:06 +0000
Subject: [PATCH] applied patch 430835 (missing wxSTD breaking compilation for
 VC++ 5)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/memory.h   |  6 +++---
 src/common/memory.cpp | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/wx/memory.h b/include/wx/memory.h
index 26c46b35e9..dab00aecca 100644
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -233,8 +233,8 @@ protected:
     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
@@ -246,7 +246,7 @@ public:
     static bool HasStream(void) { return (m_debugStream != NULL); };
     static wxSTD ostream& GetStream(void) { return *m_debugStream; }
     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 SetStandardError(void);
 
diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 24ef330d39..6679675ab0 100644
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -494,7 +494,7 @@ wxDebugContext::~wxDebugContext(void)
  * between SetFile and SetStream.
  */
 
-void wxDebugContext::SetStream(wxSTD ostream *str, streambuf *buf)
+void wxDebugContext::SetStream(wxSTD ostream *str, wxSTD streambuf *buf)
 {
   if (m_debugStream)
   {
@@ -508,7 +508,7 @@ void wxDebugContext::SetStream(wxSTD ostream *str, streambuf *buf)
 #ifndef __WATCOMC__
   if (m_streamBuf)
   {
-    streambuf* oldBuf = m_streamBuf;
+    wxSTD streambuf* oldBuf = m_streamBuf;
     m_streamBuf = NULL;
     delete oldBuf;
   }
@@ -615,13 +615,13 @@ size_t wxDebugContext::PaddedSize (const size_t size)
 {
     // Added by Terry Farnham <TJRT@pacbell.net> to replace
     // slow GetPadding call.
-	int padb;
+    int padb;
 
-	padb = size & m_balignmask;
-	if(padb)
-		return(size + m_balign - padb);
-	else
-		return(size);
+    padb = size & m_balignmask;
+    if(padb)
+        return(size + m_balign - padb);
+    else
+        return(size);
 
 // Old (slow) code
 #if 0
-- 
2.45.2