Ambiguous overload fix for gcc

[wxWidgets.git] / src / common / sckaddr.cpp

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index f158a557682af8a0b7daf16413039a49aa181ed8..d7c77768b74e4cd981a9f8dc73f178224c5a0d80 100644 (file)
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -47,7 +43,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxIPaddress)
 #if wxUSE_IPV6
 IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxIPaddress)
 #endif
 #if wxUSE_IPV6
 IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxIPaddress)
 #endif

-#if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__))
+#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__))

 IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
 #endif
 


@@ -141,10 +137,10 @@ wxIPV4address::~wxIPV4address()
 bool wxIPV4address::Hostname(const wxString& name)
 {
   // Some people are sometimes fool.
 bool wxIPV4address::Hostname(const wxString& name)
 {
   // Some people are sometimes fool.

-  if (name == wxT(""))
+  if (name.empty())

   {
     wxLogWarning( _("Trying to solve a NULL hostname: giving up") );
   {
     wxLogWarning( _("Trying to solve a NULL hostname: giving up") );

-    return FALSE;
+    return false;

   }
   m_origHostname = name;
   return (GAddress_INET_SetHostName(m_address, name.mb_str()) == GSOCK_NOERROR);
   }
   m_origHostname = name;
   return (GAddress_INET_SetHostName(m_address, name.mb_str()) == GSOCK_NOERROR);


@@ -207,21 +203,21 @@ wxSockAddress *wxIPV4address::Clone() const
 }
 
 wxString wxIPV4address::IPAddress() 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)
-               );
+{
+    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)
+        );

 }
 
 }
 

-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;
+    if(Hostname().Cmp(addr.Hostname().c_str()) == 0 && Service() == addr.Service()) return true;
+    return false;

 }
 
 #if wxUSE_IPV6
 }
 
 #if wxUSE_IPV6


@@ -245,17 +241,17 @@ wxIPV6address::~wxIPV6address()
 
 bool wxIPV6address::Hostname(const wxString& name)
 {
 
 bool wxIPV6address::Hostname(const wxString& name)
 {

-  if (name == wxT(""))
+  if (name.empty())

   {
     wxLogWarning( _("Trying to solve a NULL hostname: giving up") );
   {
     wxLogWarning( _("Trying to solve a NULL hostname: giving up") );

-    return FALSE;
+    return false;

   }
   return (GAddress_INET_SetHostName(m_address, name.mb_str()) == GSOCK_NOERROR);
 }
 
 bool wxIPV6address::Hostname(unsigned char[16] WXUNUSED(addr))
 {
   }
   return (GAddress_INET_SetHostName(m_address, name.mb_str()) == GSOCK_NOERROR);
 }
 
 bool wxIPV6address::Hostname(unsigned char[16] WXUNUSED(addr))
 {

-  return TRUE;
+  return true;

 }
 
 bool wxIPV6address::Service(const wxString& name)
 }
 
 bool wxIPV6address::Service(const wxString& name)


@@ -284,15 +280,15 @@ bool wxIPV6address::AnyAddress()
 }
 
 wxString wxIPV6address::IPAddress() const
 }
 
 wxString wxIPV6address::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)
-               );
+{
+    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)
+        );

 }
 
 wxString wxIPV6address::Hostname() const
 }
 
 wxString wxIPV6address::Hostname() const


@@ -311,7 +307,7 @@ unsigned short wxIPV6address::Service() const
 
 #endif // wxUSE_IPV6
 
 
 #endif // wxUSE_IPV6
 

-#if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__))
+#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__))

 
 // ---------------------------------------------------------------------------
 // wxUNIXaddress
 
 // ---------------------------------------------------------------------------
 // wxUNIXaddress


@@ -342,7 +338,7 @@ wxString wxUNIXaddress::Filename()
 
   path[0] = 0;
   GAddress_UNIX_GetPath(m_address, path, 1024);
 
   path[0] = 0;
   GAddress_UNIX_GetPath(m_address, path, 1024);

-  
+

   return wxString::FromAscii(path);
 }
 
   return wxString::FromAscii(path);
 }