diff --git a/peglib.h b/peglib.h index 227468e..f42f689 100644 --- a/peglib.h +++ b/peglib.h @@ -13,6 +13,9 @@ #include #if __has_include() #include +#define CPPPEGLIB_HAS_CHARCONV true +#else +#define CPPPEGLIB_HAS_CHARCONV false #endif #include #include @@ -340,15 +343,13 @@ inline std::string resolve_escape_sequence(const char *s, size_t n) { template T token_to_number_(std::string_view sv) { T n = 0; -#if __has_include() - if constexpr (!std::is_floating_point::value) { + if constexpr (CPPPEGLIB_HAS_CHARCONV && !std::is_floating_point::value) { std::from_chars(sv.data(), sv.data() + sv.size(), n); - return n; + } else { + auto s = std::string(sv); + std::istringstream ss(s); + ss >> n; } -#endif - auto s = std::string(sv); - std::istringstream ss(s); - ss >> n; return n; }