From 0cd3c4fc9132566f439a46280d145b8e9df81b11 Mon Sep 17 00:00:00 2001 From: upstream svn Date: Sun, 19 Apr 2009 17:25:45 +0200 Subject: [PATCH] Upstream tarball 9574 --- .svn-revision | 2 +- src/amuleIPV4Address.h | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.svn-revision b/.svn-revision index 0fd7b9f8..da0a81de 100644 --- a/.svn-revision +++ b/.svn-revision @@ -1 +1 @@ -9573 +9574 diff --git a/src/amuleIPV4Address.h b/src/amuleIPV4Address.h index 38cff52c..c0c1200f 100644 --- a/src/amuleIPV4Address.h +++ b/src/amuleIPV4Address.h @@ -36,23 +36,24 @@ public: amuleIPV4Address() {} amuleIPV4Address(const wxIPV4address &a) : wxIPV4address(a) {} - virtual bool Hostname(const wxString& name) { + virtual bool Hostname(const wxString& name) + { // Some people are sometimes fools. if (name.IsEmpty()) { return false; } - return Hostname(StringIPtoUint32(name)); + return wxIPV4address::Hostname(name); } - virtual bool Hostname(uint32 ip) { + virtual bool Hostname(uint32 ip) + { // Some people are sometimes fools. if (!ip) { return false; } - // We have to take care that wxIPV4address's internals changed on 2.5.2 - return GAddress_INET_SetHostAddress(m_address,wxUINT32_SWAP_ALWAYS(ip))==GSOCK_NOERROR; + return wxIPV4address::Hostname(Uint32toStringIP(ip)); } }; -- 2.11.4.GIT