compilation fix for SIZEOF_WCHAR_T being undefined

[wxWidgets.git] / src / common / log.cpp

diff --git a/src/common/log.cpp b/src/common/log.cpp
index a60e289df5a4c5f1a412959d20fda311998aa469..4ee9687b9f421527eba4c5d1134941ba188078d4 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -556,10 +556,10 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 // ----------------------------------------------------------------------------
 
 #if wxUSE_STD_IOSTREAM
 // ----------------------------------------------------------------------------
 
 #if wxUSE_STD_IOSTREAM

-wxLogStream::wxLogStream(ostream *ostr)
+wxLogStream::wxLogStream(wxSTD ostream *ostr)

 {
     if ( ostr == NULL )
 {
     if ( ostr == NULL )

-        m_ostr = &cerr;
+        m_ostr = &wxSTD cerr;

     else
         m_ostr = ostr;
 }
     else
         m_ostr = ostr;
 }


@@ -568,7 +568,7 @@ void wxLogStream::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 {
     wxString str;
     TimeStamp(&str);
 {
     wxString str;
     TimeStamp(&str);

-    (*m_ostr) << str << wxConvertWX2MB(szString) << endl;
+    (*m_ostr) << str << wxConvertWX2MB(szString) << wxSTD endl;

 }
 #endif // wxUSE_STD_IOSTREAM
 
 }
 #endif // wxUSE_STD_IOSTREAM
 


@@ -705,8 +705,14 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
 
 #ifdef  __WXDEBUG__
 
 
 #ifdef  __WXDEBUG__
 

+// wxASSERT() helper
+bool wxAssertIsEqual(int x, int y)
+{
+    return x == y;
+}
+

 // break into the debugger
 // break into the debugger

-void Trap()
+void wxTrap()

 {
 #ifdef __WXMSW__
     DebugBreak();
 {
 #ifdef __WXMSW__
     DebugBreak();


@@ -732,7 +738,7 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
 
     if ( s_bInAssert ) {
         // He-e-e-e-elp!! we're trapped in endless loop
 
     if ( s_bInAssert ) {
         // He-e-e-e-elp!! we're trapped in endless loop

-        Trap();
+        wxTrap();

 
         s_bInAssert = FALSE;
 
 
         s_bInAssert = FALSE;
 


@@ -777,7 +783,7 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
         switch ( ::MessageBox(NULL, szBuf, _T("Debug"),
                               MB_YESNOCANCEL | MB_ICONSTOP ) ) {
             case IDYES:
         switch ( ::MessageBox(NULL, szBuf, _T("Debug"),
                               MB_YESNOCANCEL | MB_ICONSTOP ) ) {
             case IDYES:

-                Trap();
+                wxTrap();

                 break;
 
             case IDCANCEL:
                 break;
 
             case IDCANCEL:


@@ -790,7 +796,7 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
         switch ( wxMessageBox(szBuf, wxT("Debug"),
                               wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
             case wxYES:
         switch ( wxMessageBox(szBuf, wxT("Debug"),
                               wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
             case wxYES:

-                Trap();
+                wxTrap();

                 break;
 
             case wxCANCEL:
                 break;
 
             case wxCANCEL:


@@ -802,7 +808,7 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
 #endif // GUI or MSW
 
 #else // !GUI
 #endif // GUI or MSW
 
 #else // !GUI

-        Trap();
+        wxTrap();

 #endif // GUI/!GUI
     }
 
 #endif // GUI/!GUI
     }