X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f6aed9c6a21d4bc732579aa564adf4cdb2c9aab..794bcc2dea743ac907b839f54e451847c9ea4b72:/include/wx/datetime.inl diff --git a/include/wx/datetime.inl b/include/wx/datetime.inl index f86b7ff956..8d3112b6a4 100644 --- a/include/wx/datetime.inl +++ b/include/wx/datetime.inl @@ -62,6 +62,7 @@ wxDateTime wxDateTime::Today() return wxDateTime(*tm); } +#if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400)) wxDateTime& wxDateTime::Set(time_t timet) { // assign first to avoid long multiplication overflow! @@ -70,16 +71,20 @@ wxDateTime& wxDateTime::Set(time_t timet) return *this; } +#endif wxDateTime& wxDateTime::SetToCurrent() { - return *this = Now(); + *this = Now(); + return *this; } +#if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400)) wxDateTime::wxDateTime(time_t timet) { Set(timet); } +#endif wxDateTime::wxDateTime(const struct tm& tm) { @@ -358,10 +363,10 @@ wxDateTime wxDateTime::ToTimezone(const wxDateTime::TimeZone& tz, // wxTimeSpan construction // ---------------------------------------------------------------------------- -wxTimeSpan::wxTimeSpan(int hours, int minutes, int seconds, int milliseconds) +wxTimeSpan::wxTimeSpan(long hours, long minutes, long seconds, long milliseconds) { // assign first to avoid precision loss - m_diff = (long)hours; + m_diff = hours; m_diff *= 60l; m_diff += minutes; m_diff *= 60l;