summaryrefslogtreecommitdiffstats
path: root/eval/src
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@broadpark.no>2019-02-08 11:51:27 +0100
committerTor Egge <Tor.Egge@broadpark.no>2019-02-08 11:51:27 +0100
commit72a396244307d6997fce8a46893ab5181f251ae9 (patch)
tree60d5dda116c52ab4363a9541fdc6d82bbaaf0ef3 /eval/src
parent373531ebe5a36c6215aef12f8dc040cb63fa1685 (diff)
Eliminate some clang warnings in eval
Diffstat (limited to 'eval/src')
-rw-r--r--eval/src/apps/tensor_conformance/tensor_conformance.cpp2
-rw-r--r--eval/src/vespa/eval/eval/test/tensor_conformance.cpp3
-rw-r--r--eval/src/vespa/eval/tensor/serialization/slime_binary_format.cpp2
3 files changed, 2 insertions, 5 deletions
diff --git a/eval/src/apps/tensor_conformance/tensor_conformance.cpp b/eval/src/apps/tensor_conformance/tensor_conformance.cpp
index 16f3f890d7e..f727f623d3f 100644
--- a/eval/src/apps/tensor_conformance/tensor_conformance.cpp
+++ b/eval/src/apps/tensor_conformance/tensor_conformance.cpp
@@ -189,7 +189,7 @@ void dump_test(const Inspector &test) {
void verify(Input &in, Output &out) {
std::map<vespalib::string,size_t> result_map;
- auto handle_test = [&out,&result_map](Slime &slime)
+ auto handle_test = [&result_map](Slime &slime)
{
TensorSpec reference_result = eval_expr(slime.get(), SimpleTensorEngine::ref(), false);
for (const auto &result: extract_fields(slime["result"])) {
diff --git a/eval/src/vespa/eval/eval/test/tensor_conformance.cpp b/eval/src/vespa/eval/eval/test/tensor_conformance.cpp
index c2dd5a536d5..7060bb76544 100644
--- a/eval/src/vespa/eval/eval/test/tensor_conformance.cpp
+++ b/eval/src/vespa/eval/eval/test/tensor_conformance.cpp
@@ -234,9 +234,6 @@ struct ImmediateRename : Eval {
//-----------------------------------------------------------------------------
-// placeholder used for unused values in a sequence
-const double X = error_value;
-
// NaN value
const double my_nan = std::numeric_limits<double>::quiet_NaN();
diff --git a/eval/src/vespa/eval/tensor/serialization/slime_binary_format.cpp b/eval/src/vespa/eval/tensor/serialization/slime_binary_format.cpp
index 94ca309ecbc..7ae3957dc0f 100644
--- a/eval/src/vespa/eval/tensor/serialization/slime_binary_format.cpp
+++ b/eval/src/vespa/eval/tensor/serialization/slime_binary_format.cpp
@@ -97,7 +97,7 @@ SlimeBinaryFormat::serialize(const Tensor &tensor)
auto slime = std::make_unique<Slime>();
SlimeInserter inserter(*slime);
serialize(inserter, tensor);
- return std::move(slime);
+ return slime;
}