fixes #136
This commit is contained in:
parent
c013223276
commit
6f8e36ac3d
3 changed files with 39 additions and 1 deletions
|
@ -380,6 +380,7 @@ I deeply appreciate the help of the following people.
|
||||||
- [Huu Nguyen](https://github.com/whoshuu) correct a variable name in the documentation.
|
- [Huu Nguyen](https://github.com/whoshuu) correct a variable name in the documentation.
|
||||||
- [Silverweed](https://github.com/silverweed) overloaded `parse()` to accept an rvalue reference.
|
- [Silverweed](https://github.com/silverweed) overloaded `parse()` to accept an rvalue reference.
|
||||||
- [dariomt](https://github.com/dariomt) fixed a subtlety in MSVC type support.
|
- [dariomt](https://github.com/dariomt) fixed a subtlety in MSVC type support.
|
||||||
|
- [ZahlGraf](https://github.com/ZahlGraf) added a workaround that allows compilation using Android NDK.
|
||||||
|
|
||||||
Thanks a lot for helping out!
|
Thanks a lot for helping out!
|
||||||
|
|
||||||
|
|
20
src/json.hpp
20
src/json.hpp
|
@ -70,6 +70,25 @@ Class @ref nlohmann::basic_json is a good entry point for the documentation.
|
||||||
using ssize_t = SSIZE_T;
|
using ssize_t = SSIZE_T;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// workaround for Android NDK (see https://github.com/nlohmann/json/issues/136)
|
||||||
|
#ifdef __ANDROID__
|
||||||
|
namespace std
|
||||||
|
{
|
||||||
|
template <typename T>
|
||||||
|
std::string to_string(T v)
|
||||||
|
{
|
||||||
|
std::ostringstream ss;
|
||||||
|
ss << v;
|
||||||
|
return ss.str();
|
||||||
|
}
|
||||||
|
|
||||||
|
inline long double strtold(const char* str, char** str_end)
|
||||||
|
{
|
||||||
|
return strtod(str, str_end);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@brief namespace for Niels Lohmann
|
@brief namespace for Niels Lohmann
|
||||||
@see https://github.com/nlohmann
|
@see https://github.com/nlohmann
|
||||||
|
@ -6009,7 +6028,6 @@ class basic_json
|
||||||
64, 64, 64, 64, 64, 64, 64, 64,
|
64, 64, 64, 64, 64, 64, 64, 64,
|
||||||
64, 64, 64, 64, 64, 64, 64, 64,
|
64, 64, 64, 64, 64, 64, 64, 64,
|
||||||
};
|
};
|
||||||
|
|
||||||
if ((m_limit - m_cursor) < 5)
|
if ((m_limit - m_cursor) < 5)
|
||||||
{
|
{
|
||||||
yyfill(); // LCOV_EXCL_LINE;
|
yyfill(); // LCOV_EXCL_LINE;
|
||||||
|
|
|
@ -70,6 +70,25 @@ Class @ref nlohmann::basic_json is a good entry point for the documentation.
|
||||||
using ssize_t = SSIZE_T;
|
using ssize_t = SSIZE_T;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// workaround for Android NDK (see https://github.com/nlohmann/json/issues/136)
|
||||||
|
#ifdef __ANDROID__
|
||||||
|
namespace std
|
||||||
|
{
|
||||||
|
template <typename T>
|
||||||
|
std::string to_string(T v)
|
||||||
|
{
|
||||||
|
std::ostringstream ss;
|
||||||
|
ss << v;
|
||||||
|
return ss.str();
|
||||||
|
}
|
||||||
|
|
||||||
|
inline long double strtold(const char* str, char** str_end)
|
||||||
|
{
|
||||||
|
return strtod(str, str_end);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@brief namespace for Niels Lohmann
|
@brief namespace for Niels Lohmann
|
||||||
@see https://github.com/nlohmann
|
@see https://github.com/nlohmann
|
||||||
|
|
Loading…
Reference in a new issue