fix for HP and IBM compilers, calls to static template functions must be qualified

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index baeec9ec91da8951143f768b4cd30ed71edaa043..22f0636f92b39c3c6e3e66cae81a84df90217dd6 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -558,7 +558,7 @@ static CharType *wxDoExpandPath(CharType *buf, const wxString& name)
     buf[0] = wxT('\0');
     if (name.empty())
         return buf;
-    nm = MYcopystring((const CharType*)name.c_str()); // Make a scratch copy
+    nm = ::MYcopystring(static_cast<const CharType*>(name.c_str())); // Make a scratch copy
     CharType *nm_tmp = nm;
 
     /* Skip leading whitespace and cr */

diff --git a/src/common/wxcrt.cpp b/src/common/wxcrt.cpp
index c9f6888a8966bc41b4b7e76be29fb7a4bcf8fc09..4b3096aee53384716821efaa2ee29e152c49f621 100644 (file)
--- a/src/common/wxcrt.cpp
+++ b/src/common/wxcrt.cpp
@@ -972,7 +972,7 @@ template<typename T>
 static wxULongLong_t wxCRT_DoStrtoull(const T* nptr, T** endptr, int base)
 {
     T sign;
-    wxULongLong_t uval = wxCRT_StrtoullBase(nptr, endptr, base, &sign);
+    wxULongLong_t uval = ::wxCRT_StrtoullBase(nptr, endptr, base, &sign);
 
     if ( sign == wxT('-') )
     {
@@ -987,7 +987,7 @@ template<typename T>
 static wxLongLong_t wxCRT_DoStrtoll(const T* nptr, T** endptr, int base)
 {
     T sign;
-    wxULongLong_t uval = wxCRT_StrtoullBase(nptr, endptr, base, &sign);
+    wxULongLong_t uval = ::wxCRT_StrtoullBase(nptr, endptr, base, &sign);
     wxLongLong_t val = 0;
 
     if ( sign == wxT('-') )