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

Merge branch 'develop' into fix/1237

Browse source
This commit is contained in:
Niels Lohmann 2018-09-29 14:50:36 +02:00 • committed by GitHub
commit 1fae82b7a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 317 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/nlohmann/detail/macro_scope.hpp
View file

@ -10,7 +10,7 @@
#error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
#endif
#elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER))
#if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40900
#if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800
#error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
#endif
#endif

2
include/nlohmann/detail/output/serializer.hpp
View file

@ -442,7 +442,7 @@ class serializer
return;
}
const bool is_negative = (x <= 0) and (x != 0); // see issue #755
const bool is_negative = not (x >= 0); // see issue #755
std::size_t i = 0;
while (x != 0)