External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use locale independant std::from_chars to parse float on char mode with c++17

Browse Source 
Fixes https://github.com/troldal/OpenXLSX/issues/133
This commit is contained in:
Gilles Vollant 2022-01-23 11:30:45 +01:00
parent 9e382f9807
commit 0871e82be1
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/pugixml.cpp
View File

@ -40,6 +40,16 @@
// For placement new // For placement new
#include <new> #include <new>
// c++17 and more detection for std::from_chars
#if (!defined(PUGIXML_HAS_CXX17)) && ((__cplusplus >= 201703L) || \
(defined(_MSC_VER) && _MSC_VER >= 1911 && _MSVC_LANG >= 201703L))
# define PUGIXML_HAS_CXX17
#endif
#if defined(PUGIXML_HAS_CXX17)
# include <charconv>
#endif
#ifdef _MSC_VER #ifdef _MSC_VER
# pragma warning(push) # pragma warning(push)
# pragma warning(disable: 4127) // conditional expression is constant # pragma warning(disable: 4127) // conditional expression is constant
@ -4591,6 +4601,10 @@ PUGI__NS_BEGIN
{ {
#ifdef PUGIXML_WCHAR_MODE #ifdef PUGIXML_WCHAR_MODE
return wcstod(value, 0); return wcstod(value, 0);
#elif defined(PUGIXML_HAS_CXX17)
double result_double = 0.0;
std::from_chars(value, (value + strlen(value)), result_double);
return result_double;
#else #else
return strtod(value, 0); return strtod(value, 0);
#endif #endif
@ -4600,6 +4614,10 @@ PUGI__NS_BEGIN
{ {
#ifdef PUGIXML_WCHAR_MODE #ifdef PUGIXML_WCHAR_MODE
return static_cast<float>(wcstod(value, 0)); return static_cast<float>(wcstod(value, 0));
#elif defined(PUGIXML_HAS_CXX17)
double result_double = 0.0;
std::from_chars(value, value + strlen(value), result_double);
return static_cast<float>(result_double);
#else #else
return static_cast<float>(strtod(value, 0)); return static_cast<float>(strtod(value, 0));
#endif #endif
@ -8419,6 +8437,10 @@ PUGI__NS_BEGIN
// parse string // parse string
#ifdef PUGIXML_WCHAR_MODE #ifdef PUGIXML_WCHAR_MODE
return wcstod(string, 0); return wcstod(string, 0);
#elif defined(PUGIXML_HAS_CXX17)
double result_double = 0.0;
std::from_chars(string, string + strlen(string), result_double);
return static_cast<float>(result_double);
#else #else
return strtod(string, 0); return strtod(string, 0);
#endif #endif