Revert "Fix #167"

This reverts commit ef10e7c5dd.
This commit is contained in:
yhirose 2021-04-07 08:54:42 -04:00
parent ef10e7c5dd
commit 73242b26c4

View File

@ -13,6 +13,9 @@
#include <cctype> #include <cctype>
#if __has_include(<charconv>) #if __has_include(<charconv>)
#include <charconv> #include <charconv>
#define CPPPEGLIB_HAS_CHARCONV true
#else
#define CPPPEGLIB_HAS_CHARCONV false
#endif #endif
#include <cstring> #include <cstring>
#include <functional> #include <functional>
@ -340,12 +343,7 @@ inline std::string resolve_escape_sequence(const char *s, size_t n) {
template <typename T> T token_to_number_(std::string_view sv) { template <typename T> T token_to_number_(std::string_view sv) {
T n = 0; T n = 0;
#if __has_include(<charconv>) if constexpr (CPPPEGLIB_HAS_CHARCONV && !std::is_floating_point<T>::value) {
if constexpr (!std::is_floating_point<T>::value) {
std::from_chars(sv.data(), sv.data() + sv.size(), n);
#else
if constexpr (false) {
#endif
std::from_chars(sv.data(), sv.data() + sv.size(), n); std::from_chars(sv.data(), sv.data() + sv.size(), n);
} else { } else {
auto s = std::string(sv); auto s = std::string(sv);