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

replace wxStringToIntType<T> with a macro to make Watcom compile the code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-08-22 19:06:31 +00:00
parent 1f5df26884
commit 941a4e6260
1 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/common/string.cpp
View File

@@ -1391,49 +1391,46 @@ int wxString::Find(wxUniChar ch, bool bFromEnd) const
// it out. Note that number extraction works correctly on UTF-8 strings, so // it out. Note that number extraction works correctly on UTF-8 strings, so
// we can use wxStringCharType and wx_str() for maximum efficiency. // we can use wxStringCharType and wx_str() for maximum efficiency.
template <typename T>
bool wxStringToIntType(const wxStringCharType *start,
T *val,
int base,
T (*func)(const wxStringCharType*, wxStringCharType**, int))
{
wxCHECK_MSG( val, false, _T("NULL output pointer") );
wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
#ifndef __WXWINCE__ #ifndef __WXWINCE__
errno = 0; #define DO_IF_NOT_WINCE(x) x
#else
#define DO_IF_NOT_WINCE(x)
#endif #endif
wxStringCharType *end; #define WX_STRING_TO_INT_TYPE(val, base, func) \
*val = (*func)(start, &end, base); wxCHECK_MSG( val, false, _T("NULL output pointer") ); \
wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") ); \
// 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 occurred DO_IF_NOT_WINCE( errno = 0; ) \
return !*end && (end != start) \
#ifndef __WXWINCE__ const wxStringCharType *start = wx_str(); \
&& (errno != ERANGE) wxStringCharType *end; \
#endif *val = func(start, &end, base); \
; \
} /* 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 */ \
/* occurred: */ \
return !*end && (end != start) \
DO_IF_NOT_WINCE( && (errno != ERANGE) )
bool wxString::ToLong(long *val, int base) const bool wxString::ToLong(long *val, int base) const
{ {
return wxStringToIntType(wx_str(), val, base, wxStrtol); WX_STRING_TO_INT_TYPE(val, base, wxStrtol);
} }
bool wxString::ToULong(unsigned long *val, int base) const bool wxString::ToULong(unsigned long *val, int base) const
{ {
return wxStringToIntType(wx_str(), val, base, wxStrtoul); WX_STRING_TO_INT_TYPE(val, base, wxStrtoul);
} }
bool wxString::ToLongLong(wxLongLong_t *val, int base) const bool wxString::ToLongLong(wxLongLong_t *val, int base) const
{ {
return wxStringToIntType(wx_str(), val, base, wxStrtoll); WX_STRING_TO_INT_TYPE(val, base, wxStrtoll);
} }
bool wxString::ToULongLong(wxULongLong_t *val, int base) const bool wxString::ToULongLong(wxULongLong_t *val, int base) const
{ {
return wxStringToIntType(wx_str(), val, base, wxStrtoull); WX_STRING_TO_INT_TYPE(val, base, wxStrtoull);
} }
bool wxString::ToDouble(double *val) const bool wxString::ToDouble(double *val) const