From 8fd7108e7cfd6d3564a71ab5f49c391613e27798 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Fri, 21 Sep 2007 02:39:08 +0000 Subject: [PATCH] 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 --- src/common/filefn.cpp | 2 +- src/common/wxcrt.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index baeec9ec91..22f0636f92 100644 --- 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(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 c9f6888a89..4b3096aee5 100644 --- a/src/common/wxcrt.cpp +++ b/src/common/wxcrt.cpp @@ -972,7 +972,7 @@ template 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 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('-') ) -- 2.47.2