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

extracted common code of ToLong and ToULong in a separate template helper

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-28 15:24:07 +00:00
parent 3f69756e3d
commit 619dcb095e
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/common/string.cpp
View File

@@ -1675,32 +1675,33 @@ int wxString::Find(const wxChar *pszSub) const
// conversion to numbers // conversion to numbers
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
bool wxString::ToLong(long *val, int base) const // the implementation of all the functions below is exactly the same so factor
// it out
template <typename T>
bool wxStringToIntType(const wxChar *start,
T *val,
int base,
T (*func)(const wxChar *, wxChar **, int))
{ {
wxCHECK_MSG( val, false, _T("NULL pointer in wxString::ToLong") ); 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") );
const wxChar *start = c_str();
wxChar *end; wxChar *end;
*val = wxStrtol(start, &end, base); *val = (*func)(start, &end, base);
// return true only if scan was stopped by the terminating NUL and if the // 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 // string was not empty to start with and no under/overflow occurred
return !*end && (end != start) && (errno != ERANGE); return !*end && (end != start) && (errno != ERANGE);
} }
bool wxString::ToLong(long *val, int base) const
{
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
{ {
wxCHECK_MSG( val, false, _T("NULL pointer in wxString::ToULong") ); return wxStringToIntType(c_str(), val, base, wxStrtoul);
wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
const wxChar *start = c_str();
wxChar *end;
*val = wxStrtoul(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 overflow occurred
return !*end && (end != start) && (errno != ERANGE);
} }
bool wxString::ToDouble(double *val) const bool wxString::ToDouble(double *val) const