AIR/cpp-peglib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-peglib.git synced 2024-12-22 11:55:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix #162 (#163)

Browse Source 
* fix unreachable code warning when <charconv> header is present

* update macro name
This commit is contained in:
Elliot 2021-03-30 14:28:44 -04:00 committed by GitHub
parent b5ee8c19df
commit 3d68799d9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
peglib.h
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,15 +343,13 @@ 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); 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; return n;
} }