j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed MinGW compilation (#81 and #80)

Browse source
This commit is contained in:
Niels 2015-06-04 08:31:13 +02:00
parent 5f4fd0b6a2
commit 266399d8e5
2 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/json.hpp
View file

@ -29,6 +29,13 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
// enable ssize_t on MinGW
#ifdef __GNUC__
#ifdef __MINGW32__
#include <sys/types.h>
#endif
#endif
/*! /*!
@brief namespace for Niels Lohmann @brief namespace for Niels Lohmann
@see https://github.com/nlohmann @see https://github.com/nlohmann
@ -2159,8 +2166,7 @@ class basic_json
recursively. Note that recursively. Note that
- strings and object keys are escaped using escape_string() - strings and object keys are escaped using escape_string()
- integer numbers are converted to a string before output using - integer numbers are converted implictly via operator<<
std::to_string()
- floating-point numbers are converted to a string using "%g" format - floating-point numbers are converted to a string using "%g" format
@param o stream to write to @param o stream to write to
@ -2278,9 +2284,10 @@ class basic_json
{ {
// 15 digits of precision allows round-trip IEEE 754 // 15 digits of precision allows round-trip IEEE 754
// string->double->string // string->double->string
const auto sz = static_cast<unsigned int>(std::snprintf(nullptr, 0, "%.15g", m_value.number_float)); using std::snprintf;
const auto sz = static_cast<unsigned int>(snprintf(nullptr, 0, "%.15g", m_value.number_float));
std::vector<typename string_t::value_type> buf(sz + 1); std::vector<typename string_t::value_type> buf(sz + 1);
std::snprintf(&buf[0], buf.size(), "%.15g", m_value.number_float); snprintf(&buf[0], buf.size(), "%.15g", m_value.number_float);
o << buf.data(); o << buf.data();
return; return;
} }

15
src/json.hpp.re2c
View file

@ -29,6 +29,13 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
// enable ssize_t on MinGW
#ifdef __GNUC__
#ifdef __MINGW32__
#include <sys/types.h>
#endif
#endif
/*! /*!
@brief namespace for Niels Lohmann @brief namespace for Niels Lohmann
@see https://github.com/nlohmann @see https://github.com/nlohmann
@ -2159,8 +2166,7 @@ class basic_json
recursively. Note that recursively. Note that
- strings and object keys are escaped using escape_string() - strings and object keys are escaped using escape_string()
- integer numbers are converted to a string before output using - integer numbers are converted implictly via operator<<
std::to_string()
- floating-point numbers are converted to a string using "%g" format - floating-point numbers are converted to a string using "%g" format
@param o stream to write to @param o stream to write to
@ -2278,9 +2284,10 @@ class basic_json
{ {
// 15 digits of precision allows round-trip IEEE 754 // 15 digits of precision allows round-trip IEEE 754
// string->double->string // string->double->string
const auto sz = static_cast<unsigned int>(std::snprintf(nullptr, 0, "%.15g", m_value.number_float)); using std::snprintf;
const auto sz = static_cast<unsigned int>(snprintf(nullptr, 0, "%.15g", m_value.number_float));
std::vector<typename string_t::value_type> buf(sz + 1); std::vector<typename string_t::value_type> buf(sz + 1);
std::snprintf(&buf[0], buf.size(), "%.15g", m_value.number_float); snprintf(&buf[0], buf.size(), "%.15g", m_value.number_float);
o << buf.data(); o << buf.data();
return; return;
} }