diff options
author | Arne H Juul <arnej27959@users.noreply.github.com> | 2020-11-11 12:53:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-11 12:53:56 +0100 |
commit | 8d1cabe631a5a85c000bac303a90eb4149f6e73c (patch) | |
tree | ee9247eaffa6211dc0e8de77ad55ac036f7bb099 /eval | |
parent | 106a4c8115aaea20fd6da7bd9801d525f5da804d (diff) | |
parent | 743bab820142bce21069588380742e29fac43693 (diff) |
Merge pull request #15267 from vespa-engine/toregge/avoid-clang-11-warnings
Avoid clang 11 warnings.
Diffstat (limited to 'eval')
-rw-r--r-- | eval/src/tests/instruction/generic_peek/generic_peek_test.cpp | 4 | ||||
-rw-r--r-- | eval/src/vespa/eval/eval/tensor_function.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/eval/src/tests/instruction/generic_peek/generic_peek_test.cpp b/eval/src/tests/instruction/generic_peek/generic_peek_test.cpp index 3874b254ad8..ef78d0cde68 100644 --- a/eval/src/tests/instruction/generic_peek/generic_peek_test.cpp +++ b/eval/src/tests/instruction/generic_peek/generic_peek_test.cpp @@ -49,10 +49,10 @@ TensorSpec reference_peek(const TensorSpec ¶m, const vespalib::string &resul for (const auto & [dim_name, label_or_child] : spec) { std::visit(vespalib::overload { - [&](const TensorSpec::Label &label) { + [&,&dim_name = dim_name](const TensorSpec::Label &label) { addr.emplace(dim_name, label); }, - [&](const size_t &child_value) { + [&,&dim_name = dim_name](const size_t &child_value) { // here, label_or_child is a size_t specifying the value // we pretend a child produced if (is_mapped_dim(dim_name)) { diff --git a/eval/src/vespa/eval/eval/tensor_function.cpp b/eval/src/vespa/eval/eval/tensor_function.cpp index 4a5fe50e27b..77ca6c1b8f0 100644 --- a/eval/src/vespa/eval/eval/tensor_function.cpp +++ b/eval/src/vespa/eval/eval/tensor_function.cpp @@ -506,10 +506,10 @@ Peek::compile_self(EngineOrFactory engine, Stash &stash) const size_t child_idx = 0; for (const auto & [dim_name, label_or_child] : spec()) { std::visit(vespalib::overload { - [&](const TensorSpec::Label &label) { + [&,&dim_name = dim_name](const TensorSpec::Label &label) { generic_spec.emplace(dim_name, label); }, - [&](const TensorFunction::Child &) { + [&,&dim_name = dim_name](const TensorFunction::Child &) { generic_spec.emplace(dim_name, child_idx++); } }, label_or_child); |