Combine StrToInt methods.

core/include/fxcrt/fx_ext.h

Index: core/include/fxcrt/fx_ext.h
diff --git a/core/include/fxcrt/fx_ext.h b/core/include/fxcrt/fx_ext.h
index 3f4f6681908950772e9cf1bdef41cf061520366b..e7e170225838957ee0d0a5ebbe8908ced7865c2f 100644
--- a/core/include/fxcrt/fx_ext.h
+++ b/core/include/fxcrt/fx_ext.h
@@ -53,13 +53,33 @@ inline int FXSYS_toHexDigit(const FX_CHAR c) {
   return upchar > '9' ? upchar - 'A' + 10 : upchar - '0';
 }
 
+inline bool FXSYS_isDecimalDigit(const FX_CHAR c) {
+  return std::isdigit(c);
+}
+
+inline bool FXSYS_isDecimalDigit(const FX_WCHAR c) {
+  return std::iswdigit(c);
+}
+
+inline int FXSYS_toDecimalDigit(const uint8_t c) {

[Tom Sepez, 2016/03/03 19:26:47]

I worry about duplicate definitions if we hit a platform where FX_CHAR is
uint8_t or FX_WCHAR is int.

[dsinclair, 2016/03/03 19:36:12]

So, if I try to compile without these I get errors that it's ambiguous which
method to choose for uint8_t and int. Without these, I'll need to cast on the
calling side to FX_CHAR, would that be better?

[Tom Sepez, 2016/03/03 20:14:58]

Yes, that would be clearer and safer.

[dsinclair, 2016/03/03 20:26:01]

Done.

+  if (!std::isdigit(c))
+    return 0;
+  return c - '0';
+}
+
+inline int FXSYS_toDecimalDigit(const int c) {
+  if (!std::isdigit(c))
+    return 0;
+  return c - '0';
+}
+
 inline int FXSYS_toDecimalDigit(const FX_CHAR c) {
   if (!std::isdigit(c))
     return 0;
   return c - '0';
 }
 
-inline int FXSYS_toDecimalDigitWide(const FX_WCHAR c) {
+inline int FXSYS_toDecimalDigit(const FX_WCHAR c) {
   if (!std::iswdigit(c))
     return 0;
   return c - L'0';