some conflicts resolved

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

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index 5681aaadd7c6775d9d205ffd3e454d660923f0bd..fff40bef7ddae9e2cec462773dd72225a51bee00 100644 (file)
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -103,8 +103,8 @@ wxIPV4address::~wxIPV4address()
 bool wxIPV4address::Hostname(const wxString& name)
 {
   // Some people are sometimes fool.
-  if (name == _T("")) {
-    wxLogWarning( _T("Trying to solve a NULL hostname: giving up") );
+  if (name == wxT("")) {
+    wxLogWarning( wxT("Trying to solve a NULL hostname: giving up") );
     return FALSE;
   }