Commit 6f8e36ac authored by Niels's avatar Niels
Browse files

fixes #136

parent c0132232
......@@ -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.
- [Silverweed](https://github.com/silverweed) overloaded `parse()` to accept an rvalue reference.
- [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!
......
......@@ -70,6 +70,25 @@ Class @ref nlohmann::basic_json is a good entry point for the documentation.
using ssize_t = SSIZE_T;
#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
@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,
};
if ((m_limit - m_cursor) < 5)
{
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;
#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
@see https://github.com/nlohmann
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment