X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4abc0fc8d0868dfeff7f3aad8b915034290e62d..ead7ce1013868743dc6482d11c52f5180fffcabd:/src/common/date.cpp diff --git a/src/common/date.cpp b/src/common/date.cpp index 3aaf3d2f47..2b248eab65 100644 --- a/src/common/date.cpp +++ b/src/common/date.cpp @@ -28,7 +28,7 @@ #include "wx/setup.h" -#ifdef wxUSE_TIMEDATE +#if wxUSE_TIMEDATE #include "wx/date.h" #include @@ -159,10 +159,12 @@ void wxDate::operator = (const wxString& dat) // Conversion operations ////////////////////////////////////////////////////////////// +#ifndef __SALFORDC__ wxDate::operator wxString( void ) { return FormatDate(); } +#endif ////////////////////////////////////////////////////////////// // Date Arithmetic @@ -277,7 +279,7 @@ bool WXDLLEXPORT operator != (const wxDate &dt1, const wxDate &dt2) // Ostream operations //////////////////////////////////////////////////////////////// -ostream& WXDLLEXPORT operator << (ostream &os, const wxDate &dt) +ostream WXDLLEXPORT & operator << (ostream &os, const wxDate &dt) { return os << (const char *) dt.FormatDate(); }