X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd107c50be43e8d4dbdba20df162faf119a3781c..eccf1b2c7651b72cce91a83e3f2778e6325a955b:/src/common/memory.cpp

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