Mercurial > malikania
changeset 105:0a4a246d765b
Common: fix temporarily json
author | David Demelier <markand@malikania.fr> |
---|---|
date | Sat, 26 Aug 2017 09:10:57 +0200 |
parents | 385ba70b93e3 |
children | f8c6d2244795 |
files | extern/json/json.hpp |
diffstat | 1 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/extern/json/json.hpp Sat Sep 02 11:24:42 2017 +0200 +++ b/extern/json/json.hpp Sat Aug 26 09:10:57 2017 +0200 @@ -6460,12 +6460,17 @@ { // assertion to check that the iterator range is indeed contiguous, // see http://stackoverflow.com/a/35008842/266378 for more discussion + + // Disable the assert because it triggers a bug in gcc7/glibc + // https://github.com/nlohmann/json/issues/705 +#if 0 assert(std::accumulate(first, last, std::pair<bool, int>(true, 0), [&first](std::pair<bool, int> res, decltype(*first) val) { res.first &= (val == *(std::next(std::addressof(*first), res.second++))); return res; }).first); +#endif // assertion to check that each element is 1 byte long static_assert(sizeof(typename std::iterator_traits<IteratorType>::value_type) == 1,