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

Simplest fix received from OW community (Peter C. Chapin).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-10-30 18:40:50 +00:00
parent cbc82a22cc
commit 122f3c5dc0
1 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/common/string.cpp
View File

@@ -1681,13 +1681,18 @@ int wxString::Find(const wxChar *pszSub) const
// the implementation of all the functions below is exactly the same so factor // the implementation of all the functions below is exactly the same so factor
// it out // it out
#ifndef __WATCOMC__
#ifdef __WATCOMC__
#define STR2INTLINK _WCRTLINK
#else
#define STR2INTLINK
#endif
template <typename T> template <typename T>
bool wxStringToIntType(const wxChar *start, bool wxStringToIntType(const wxChar *start,
T *val, T *val,
int base, int base,
T (*func)(const wxChar *, wxChar **, int)) T STR2INTLINK (*func)(const wxChar *, wxChar **, int))
{ {
wxCHECK_MSG( val, false, _T("NULL output pointer") ); wxCHECK_MSG( val, false, _T("NULL output pointer") );
wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") ); wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
@@ -1708,40 +1713,20 @@ bool wxStringToIntType(const wxChar *start,
; ;
} }
#define wxSTR2INT(val, b, func) return wxStringToIntType(c_str(), val, b, func)
#else // __WATCOMC__
// FIXME, TODO, ASAP !!! - ugly trick to make release for Open Watcom possible
// without changing code flow for other compilers
#define wxSTR2INT(val, base, func) \
wxCHECK_MSG( val, false, _T("NULL output pointer") ); \
wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") ); \
\
errno = 0; \
\
wxChar *end; \
*val = (*func)(c_str(), &end, base); \
\
return !*end && (end != c_str()) && (errno != ERANGE)
#endif // !__WATCOMC__/__WATCOMC__
bool wxString::ToLong(long *val, int base) const bool wxString::ToLong(long *val, int base) const
{ {
wxSTR2INT(val, base, wxStrtol); return wxStringToIntType(c_str(), val, base, wxStrtol);
} }
bool wxString::ToULong(unsigned long *val, int base) const bool wxString::ToULong(unsigned long *val, int base) const
{ {
wxSTR2INT(val, base, wxStrtoul); return wxStringToIntType(c_str(), val, base, wxStrtoul);
} }
bool wxString::ToLongLong(wxLongLong_t *val, int base) const bool wxString::ToLongLong(wxLongLong_t *val, int base) const
{ {
#ifdef wxHAS_STRTOLL #ifdef wxHAS_STRTOLL
wxSTR2INT(val, base, wxStrtoll); return wxStringToIntType(c_str(), val, base, wxStrtoll);
#else #else
// TODO: implement this ourselves // TODO: implement this ourselves
wxUnusedVar(val); wxUnusedVar(val);
@@ -1753,7 +1738,7 @@ bool wxString::ToLongLong(wxLongLong_t *val, int base) const
bool wxString::ToULongLong(wxULongLong_t *val, int base) const bool wxString::ToULongLong(wxULongLong_t *val, int base) const
{ {
#ifdef wxHAS_STRTOLL #ifdef wxHAS_STRTOLL
wxSTR2INT(val, base, wxStrtoull); return wxStringToIntType(c_str(), val, base, wxStrtoull);
#else #else
// TODO: implement this ourselves // TODO: implement this ourselves
wxUnusedVar(val); wxUnusedVar(val);