diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2020-10-21 23:50:01 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2020-10-21 23:50:29 +0200 |
commit | 916648b8955e022a6774bf77c837dc99e64af990 (patch) | |
tree | a4e8c2cf736fa23b7201ae00360476edfa104581 | |
parent | de6e004f37d8a327d3d537ad99e7e4762d217df2 (diff) |
Avoid clang 11 warnings.
-rw-r--r-- | eval/src/vespa/eval/eval/array_array_map.h | 2 | ||||
-rw-r--r-- | eval/src/vespa/eval/instruction/generic_reduce.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/eval/src/vespa/eval/eval/array_array_map.h b/eval/src/vespa/eval/eval/array_array_map.h index 8ccc3492428..89fa0c77819 100644 --- a/eval/src/vespa/eval/eval/array_array_map.h +++ b/eval/src/vespa/eval/eval/array_array_map.h @@ -117,7 +117,7 @@ private: } } _values.resize(_values.size() + _values_per_entry, V{}); - auto [pos, was_inserted] = _map.insert(MyKey{tag_id,hash}); + auto [pos, was_inserted] = _map.insert(MyKey{{tag_id},hash}); assert(was_inserted); return Tag{tag_id}; } diff --git a/eval/src/vespa/eval/instruction/generic_reduce.cpp b/eval/src/vespa/eval/instruction/generic_reduce.cpp index 9ca8c943ada..43e11ced49b 100644 --- a/eval/src/vespa/eval/instruction/generic_reduce.cpp +++ b/eval/src/vespa/eval/instruction/generic_reduce.cpp @@ -79,7 +79,7 @@ generic_reduce(const Value &value, const ReduceParam ¶m) { auto [tag, ignore] = map.lookup_or_add_entry(keep_addr); AGGR *dst = nullptr; auto next = [&](size_t idx) { (dst++)->next(cells[idx]); }; - auto fill_aggrs = [&](size_t idx) { + auto fill_aggrs = [&,tag = tag](size_t idx) { dst = map.get_values(tag).begin(); param.dense_plan.execute_keep(idx, next); }; |