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

STL build compilation fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-10-10 21:20:46 +00:00
parent a08711325b
commit 7a0007346b
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
utils/ifacecheck/src/xmlparser.cpp
View File

@@ -659,19 +659,20 @@ typedef std::map<unsigned long, toResolveTypeItem> wxToResolveTypeHashMap;
// utility to parse gccXML ID values; // utility to parse gccXML ID values;
// this function is equivalent to wxString(str).Mid(1).ToULong(&id, GCCXML_BASE) // this function is equivalent to wxString(str).Mid(1).ToULong(&id, GCCXML_BASE)
// but is a little bit faster // but is a little bit faster
bool getID(unsigned long *id, const wxStringCharType* str) bool getID(unsigned long *id, const wxString& str)
{ {
const wxStringCharType * const start = str.wx_str();
wxStringCharType *end; wxStringCharType *end;
#if wxUSE_UNICODE_WCHAR #if wxUSE_UNICODE_WCHAR
unsigned long val = wcstoul(str+1, &end, GCCXML_BASE); unsigned long val = wcstoul(start, &end, GCCXML_BASE);
#else #else
unsigned long val = strtoul(str+1, &end, GCCXML_BASE); unsigned long val = strtoul(start, &end, GCCXML_BASE);
#endif #endif
// return true only if scan was stopped by the terminating NUL and // return true only if scan was stopped by the terminating NUL and
// if the string was not empty to start with and no under/overflow // if the string was not empty to start with and no under/overflow
// occurred: // occurred:
if ( *end != '\0' || end == str+1 || errno == ERANGE || errno == EINVAL ) if ( *end != '\0' || end == start || errno == ERANGE || errno == EINVAL )
return false; return false;
*id = val; *id = val;
@@ -680,19 +681,20 @@ bool getID(unsigned long *id, const wxStringCharType* str)
// utility specialized to parse efficiently the gccXML list of IDs which occur // utility specialized to parse efficiently the gccXML list of IDs which occur
// in nodes like <Class> ones... i.e. numeric values separed by " _" token // in nodes like <Class> ones... i.e. numeric values separed by " _" token
bool getMemberIDs(wxClassMemberIdHashMap* map, wxClass* p, const wxStringCharType* str) bool getMemberIDs(wxClassMemberIdHashMap* map, wxClass* p, const wxString& str)
{ {
const wxStringCharType * const start = str.wx_str();
#if wxUSE_UNICODE_WCHAR #if wxUSE_UNICODE_WCHAR
size_t len = wcslen(str); size_t len = wcslen(start);
#else #else
size_t len = strlen(str); size_t len = strlen(start);
#endif #endif
if (len == 0 || str[0] != '_') if (len == 0 || start[0] != '_')
return false; return false;
const wxStringCharType *curpos = str, const wxStringCharType *curpos = start,
*end = str + len; *end = start + len;
wxStringCharType *nexttoken; wxStringCharType *nexttoken;
while (curpos < end) while (curpos < end)