X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/97c153e44634a9b2b17614f85035205a0d9eaa46..ad4e3f7be6f20d5a164a608b44c51056231ddad9:/src/common/sckaddr.cpp?ds=sidebyside diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp index 188368da8f..86a440f009 100644 --- a/src/common/sckaddr.cpp +++ b/src/common/sckaddr.cpp @@ -9,10 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "sckaddr.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -209,19 +205,18 @@ wxSockAddress *wxIPV4address::Clone() const wxString wxIPV4address::IPAddress() const { unsigned long raw = GAddress_INET_GetHostAddress(m_address); - return wxString::Format( - _T("%u.%u.%u.%u"), - (unsigned char)((raw>>24) & 0xff), - (unsigned char)((raw>>16) & 0xff), - (unsigned char)((raw>>8) & 0xff), - (unsigned char)(raw & 0xff) + return wxString::Format(_T("%lu.%lu.%lu.%lu"), + (raw>>24) & 0xff, + (raw>>16) & 0xff, + (raw>>8) & 0xff, + raw & 0xff ); } -bool wxIPV4address::operator==(wxIPV4address& addr) +bool wxIPV4address::operator==(const wxIPV4address& addr) const { - if(Hostname().Cmp(addr.Hostname().c_str()) == 0 && Service() == addr.Service()) return true; - return false; + return Hostname().Cmp(addr.Hostname().c_str()) == 0 && + Service() == addr.Service(); } #if wxUSE_IPV6