X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47d67540a017101b3e46abe9ef0f55914d8de37e..ead7ce1013868743dc6482d11c52f5180fffcabd:/src/common/date.cpp diff --git a/src/common/date.cpp b/src/common/date.cpp index 1097624d59..2b248eab65 100644 --- a/src/common/date.cpp +++ b/src/common/date.cpp @@ -159,10 +159,12 @@ void wxDate::operator = (const wxString& dat) // Conversion operations ////////////////////////////////////////////////////////////// +#ifndef __SALFORDC__ wxDate::operator wxString( void ) { return FormatDate(); } +#endif ////////////////////////////////////////////////////////////// // Date Arithmetic @@ -243,32 +245,32 @@ wxDate &wxDate::operator --(int) // Date comparison ////////////////////////////////////////////////////////////// -bool operator < (const wxDate &dt1, const wxDate &dt2) +bool WXDLLEXPORT operator < (const wxDate &dt1, const wxDate &dt2) { return ( dt1.julian < dt2.julian ); } -bool operator <= (const wxDate &dt1, const wxDate &dt2) +bool WXDLLEXPORT operator <= (const wxDate &dt1, const wxDate &dt2) { return ( (dt1.julian == dt2.julian) || (dt1.julian < dt2.julian) ); } -bool operator > (const wxDate &dt1, const wxDate &dt2) +bool WXDLLEXPORT operator > (const wxDate &dt1, const wxDate &dt2) { return ( dt1.julian > dt2.julian ); } -bool operator >= (const wxDate &dt1, const wxDate &dt2) +bool WXDLLEXPORT operator >= (const wxDate &dt1, const wxDate &dt2) { return ( (dt1.julian == dt2.julian) || (dt1.julian > dt2.julian) ); } -bool operator == (const wxDate &dt1, const wxDate &dt2) +bool WXDLLEXPORT operator == (const wxDate &dt1, const wxDate &dt2) { return ( dt1.julian == dt2.julian ); } -bool operator != (const wxDate &dt1, const wxDate &dt2) +bool WXDLLEXPORT operator != (const wxDate &dt1, const wxDate &dt2) { return ( dt1.julian != dt2.julian ); } @@ -277,7 +279,7 @@ bool operator != (const wxDate &dt1, const wxDate &dt2) // Ostream operations //////////////////////////////////////////////////////////////// -ostream &operator << (ostream &os, const wxDate &dt) +ostream WXDLLEXPORT & operator << (ostream &os, const wxDate &dt) { return os << (const char *) dt.FormatDate(); }