Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-09-21 02:39:08 +00:00
parent 043c67059f
commit 8fd7108e7c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/filefn.cpp
View File

@@ -558,7 +558,7 @@ static CharType *wxDoExpandPath(CharType *buf, const wxString& name)
buf[0] = wxT('\0'); buf[0] = wxT('\0');
if (name.empty()) if (name.empty())
return buf; 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; CharType *nm_tmp = nm;
/* Skip leading whitespace and cr */ /* Skip leading whitespace and cr */

4
src/common/wxcrt.cpp
View File

@@ -972,7 +972,7 @@ template<typename T>
static wxULongLong_t wxCRT_DoStrtoull(const T* nptr, T** endptr, int base) static wxULongLong_t wxCRT_DoStrtoull(const T* nptr, T** endptr, int base)
{ {
T sign; T sign;
wxULongLong_t uval = wxCRT_StrtoullBase(nptr, endptr, base, &sign); wxULongLong_t uval = ::wxCRT_StrtoullBase(nptr, endptr, base, &sign);
if ( sign == wxT('-') ) if ( sign == wxT('-') )
{ {
@@ -987,7 +987,7 @@ template<typename T>
static wxLongLong_t wxCRT_DoStrtoll(const T* nptr, T** endptr, int base) static wxLongLong_t wxCRT_DoStrtoll(const T* nptr, T** endptr, int base)
{ {
T sign; T sign;
wxULongLong_t uval = wxCRT_StrtoullBase(nptr, endptr, base, &sign); wxULongLong_t uval = ::wxCRT_StrtoullBase(nptr, endptr, base, &sign);
wxLongLong_t val = 0; wxLongLong_t val = 0;
if ( sign == wxT('-') ) if ( sign == wxT('-') )