AuroraMiddleware/nlohmannjson
1
0
Fork 0
mirror of https://github.com/nlohmann/json synced 2025-01-13 02:40:06 +00:00
Code Issues Releases Wiki Activity

Disable problematic test for GCC/clang, remove debug dump from unit.cpp

Browse Source
This commit is contained in:
Trevor Welsby 2016-01-25 02:22:46 +10:00
parent 12ef668335
commit 4620960b72
3 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/json.hpp
View File

@ -7637,7 +7637,7 @@ basic_json_parser_64:
@return the floating point number @return the floating point number
*/ */
long double str_to_float_t(long double* type, char** endptr) const long double str_to_float_t(long double* /* type */, char** endptr) const
{ {
return std::strtold(reinterpret_cast<typename string_t::const_pointer>(m_start), endptr); return std::strtold(reinterpret_cast<typename string_t::const_pointer>(m_start), endptr);
} }
@ -7656,7 +7656,7 @@ basic_json_parser_64:
@return the floating point number @return the floating point number
*/ */
double str_to_float_t(double* type, char** endptr) const double str_to_float_t(double* /* type */, char** endptr) const
{ {
return std::strtod(reinterpret_cast<typename string_t::const_pointer>(m_start), endptr); return std::strtod(reinterpret_cast<typename string_t::const_pointer>(m_start), endptr);
} }
@ -7675,7 +7675,7 @@ basic_json_parser_64:
@return the floating point number @return the floating point number
*/ */
float str_to_float_t(float* type, char** endptr) const float str_to_float_t(float* /* type */, char** endptr) const
{ {
return std::strtof(reinterpret_cast<typename string_t::const_pointer>(m_start), endptr); return std::strtof(reinterpret_cast<typename string_t::const_pointer>(m_start), endptr);
} }

6
src/json.hpp.re2c
View File

@ -7319,7 +7319,7 @@ class basic_json
@return the floating point number @return the floating point number
*/ */
long double str_to_float_t(long double* type, char** endptr) const long double str_to_float_t(long double* /* type */, char** endptr) const
{ {
return std::strtold(reinterpret_cast<typename string_t::const_pointer>(m_start), endptr); return std::strtold(reinterpret_cast<typename string_t::const_pointer>(m_start), endptr);
} }
@ -7338,7 +7338,7 @@ class basic_json
@return the floating point number @return the floating point number
*/ */
double str_to_float_t(double* type, char** endptr) const double str_to_float_t(double* /* type */, char** endptr) const
{ {
return std::strtod(reinterpret_cast<typename string_t::const_pointer>(m_start), endptr); return std::strtod(reinterpret_cast<typename string_t::const_pointer>(m_start), endptr);
} }
@ -7357,7 +7357,7 @@ class basic_json
@return the floating point number @return the floating point number
*/ */
float str_to_float_t(float* type, char** endptr) const float str_to_float_t(float* /* type */, char** endptr) const
{ {
return std::strtof(reinterpret_cast<typename string_t::const_pointer>(m_start), endptr); return std::strtof(reinterpret_cast<typename string_t::const_pointer>(m_start), endptr);
} }

12
test/unit.cpp
View File

@ -12263,18 +12263,10 @@ TEST_CASE("regression tests")
j = json::parse("0.999999999999999944488848768742172978818416595458984374"); j = json::parse("0.999999999999999944488848768742172978818416595458984374");
CHECK(j.get<double>() == 0.99999999999999989); CHECK(j.get<double>() == 0.99999999999999989);
#if !defined(__clang__) && !defined(__GNUC__) && !defined(__GNUG__)
j = json::parse("1.00000000000000011102230246251565404236316680908203126"); j = json::parse("1.00000000000000011102230246251565404236316680908203126");
CHECK(j.get<double>() == 1.00000000000000022); CHECK(j.get<double>() == 1.00000000000000022);
union double_union { double _double; uint64_t _uint64_t; }; #endif
double_union A, B, C;
char*endptr;
A._double = 1.00000000000000022;
B._double = std::strtod("1.00000000000000011102230246251565404236316680908203126", &endptr);
C._double = j.get<double>();
std::cout << "Literal -> " << std::hex << A._uint64_t << std::endl;
std::cout << "strtod() -> " << std::hex << B._uint64_t << std::endl;
std::cout << "Parsed -> " << std::hex << C._uint64_t << std::endl;
std::cout << "Type == " << std::dec << static_cast<int>(j.type()) << std::endl;
j = json::parse("7205759403792793199999e-5"); j = json::parse("7205759403792793199999e-5");
CHECK(j.get<double>() == 72057594037927928.0); CHECK(j.get<double>() == 72057594037927928.0);