From 55dfa8d3eadbcad32bb7a779f10286dd49b60ce1 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Mon, 24 Jan 2000 13:27:37 +0000 Subject: [PATCH] Applied some of the SGI fixes. Don't know about the toolbar one. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/datetime.inl | 3 ++- src/common/longlong.cpp | 4 +++- src/unix/dialup.cpp | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/wx/datetime.inl b/include/wx/datetime.inl index 49567d1327..8d3112b6a4 100644 --- a/include/wx/datetime.inl +++ b/include/wx/datetime.inl @@ -75,7 +75,8 @@ wxDateTime& wxDateTime::Set(time_t timet) wxDateTime& wxDateTime::SetToCurrent() { - return *this = Now(); + *this = Now(); + return *this; } #if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400)) diff --git a/src/common/longlong.cpp b/src/common/longlong.cpp index 5fd1016b5f..d85b5420fb 100644 --- a/src/common/longlong.cpp +++ b/src/common/longlong.cpp @@ -591,7 +591,9 @@ wxLongLongWx& wxLongLongWx::operator/=(const wxLongLongWx& ll) Divide(ll, quotient, remainder); - return *this = quotient; + *this = quotient; + + return *this; } wxLongLongWx wxLongLongWx::operator%(const wxLongLongWx& ll) const diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp index 1e2154ce5e..5bbfd306d0 100644 --- a/src/unix/dialup.cpp +++ b/src/unix/dialup.cpp @@ -566,7 +566,7 @@ wxDialUpManagerImpl::CheckIfconfig(void) || strstr(output,"sl") // slip || strstr(output,"pl"); // plip #elif defined(__SGI__) // IRIX - rc = strstr(output, "ppp"); // PPP + rc = (int) strstr(output, "ppp"); // PPP #elif defined(__HPUX__) // if could run ifconfig on interface, then it exists rc = TRUE; -- 2.45.2