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
This commit is contained in:
@@ -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 */
|
||||
|
@@ -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('-') )
|
||||
|
Reference in New Issue
Block a user