1
0
mirror of https://github.com/nlohmann/json synced 2024-12-25 18:11:05 +00:00
This commit is contained in:
Niels 2016-01-01 18:33:58 +01:00
parent 3905406f9c
commit 9b07504e23
3 changed files with 5 additions and 4 deletions

View File

@ -386,6 +386,7 @@ I deeply appreciate the help of the following people.
- [ZahlGraf](https://github.com/ZahlGraf) added a workaround that allows compilation using Android NDK.
- [whackashoe](https://github.com/whackashoe) replaced a function that was marked as unsafe by Visual Studio.
- [406345](https://github.com/406345) fixed two small warnings.
- [Glen Fernandes](https://github.com/glenfe) noted a potential portability problem in the `has_mapped_type` function.
Thanks a lot for helping out!

View File

@ -94,9 +94,9 @@ struct has_mapped_type
{
private:
template<typename C> static char test(typename C::mapped_type*);
template<typename C> static int test(...);
template<typename C> static char (&test(...))[2];
public:
enum { value = sizeof(test<T>(0)) == sizeof(char) };
static constexpr bool value = sizeof(test<T>(0)) == 1;
};
/// "equality" comparison for floating point numbers

View File

@ -94,9 +94,9 @@ struct has_mapped_type
{
private:
template<typename C> static char test(typename C::mapped_type*);
template<typename C> static int test(...);
template<typename C> static char (&test(...))[2];
public:
enum { value = sizeof(test<T>(0)) == sizeof(char) };
static constexpr bool value = sizeof(test<T>(0)) == 1;
};
/// "equality" comparison for floating point numbers