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

Merge pull request #1230 from mandreyel/lambda-unevaluated-context-fix

Browse source 
Move lambda out of unevaluated context
This commit is contained in:
Niels Lohmann 2018-09-10 20:52:11 +02:00 committed by GitHub
commit 186c747a19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/nlohmann/detail/input/input_adapters.hpp
View file

@ -320,15 +320,18 @@ class input_adapter
int>::type = 0> int>::type = 0>
input_adapter(IteratorType first, IteratorType last) input_adapter(IteratorType first, IteratorType last)
{ {
#ifndef NDEBUG
// assertion to check that the iterator range is indeed contiguous, // assertion to check that the iterator range is indeed contiguous,
// see http://stackoverflow.com/a/35008842/266378 for more discussion // see http://stackoverflow.com/a/35008842/266378 for more discussion
assert(std::accumulate( const auto is_contiguous = std::accumulate(
first, last, std::pair<bool, int>(true, 0), first, last, std::pair<bool, int>(true, 0),
[&first](std::pair<bool, int> res, decltype(*first) val) [&first](std::pair<bool, int> res, decltype(*first) val)
{ {
res.first &= (val == *(std::next(std::addressof(*first), res.second++))); res.first &= (val == *(std::next(std::addressof(*first), res.second++)));
return res; return res;
}).first); }).first;
assert(is_contiguous);
#endif
// assertion to check that each element is 1 byte long // assertion to check that each element is 1 byte long
static_assert( static_assert(

11
single_include/nlohmann/json.hpp
View file

@ -2184,15 +2184,18 @@ class input_adapter
int>::type = 0> int>::type = 0>
input_adapter(IteratorType first, IteratorType last) input_adapter(IteratorType first, IteratorType last)
{ {
#ifndef NDEBUG
// assertion to check that the iterator range is indeed contiguous, // assertion to check that the iterator range is indeed contiguous,
// see http://stackoverflow.com/a/35008842/266378 for more discussion // see http://stackoverflow.com/a/35008842/266378 for more discussion
assert(std::accumulate( const auto is_contiguous = std::accumulate(
first, last, std::pair<bool, int>(true, 0), first, last, std::pair<bool, int>(true, 0),
[&first](std::pair<bool, int> res, decltype(*first) val) [&first](std::pair<bool, int> res, decltype(*first) val)
{ {
res.first &= (val == *(std::next(std::addressof(*first), res.second++))); res.first &= (val == *(std::next(std::addressof(*first), res.second++)));
return res; return res;
}).first); }).first;
assert(is_contiguous);
#endif
// assertion to check that each element is 1 byte long // assertion to check that each element is 1 byte long
static_assert( static_assert(