diff options
Diffstat (limited to 'core/src/fxcrt/fx_basic_gcc.cpp')
-rw-r--r-- | core/src/fxcrt/fx_basic_gcc.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/core/src/fxcrt/fx_basic_gcc.cpp b/core/src/fxcrt/fx_basic_gcc.cpp index 6f17482156..71f5fe322f 100644 --- a/core/src/fxcrt/fx_basic_gcc.cpp +++ b/core/src/fxcrt/fx_basic_gcc.cpp @@ -12,21 +12,20 @@ template <class T, class STR_T> T FXSYS_StrToInt(STR_T str) { FX_BOOL neg = FALSE; - if (str == NULL) { + if (!str) return 0; - } + if (*str == '-') { neg = TRUE; str++; } T num = 0; while (*str) { - if ((*str) < '0' || (*str) > '9') { + if (!std::isdigit(*str)) break; - } - if (num > (std::numeric_limits<T>::max() - 9) / 10) { + if (num > (std::numeric_limits<T>::max() - 9) / 10) break; - } + num = num * 10 + (*str) - '0'; str++; } |