amorfo77/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-29 00:55:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix/1237

Browse Source
This commit is contained in:
Niels Lohmann authored and GitHub committed 2018-09-29 14:50:36 +02:00
2 parents 4e52277b70 22e55349a6
commit 1fae82b7a7
16 files changed
+317 -97
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/nlohmann/detail/macro_scope.hpp
+1 -1
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
include/nlohmann/detail/output/serializer.hpp
+1 -1
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)