aboutsummaryrefslogtreecommitdiffstats
path: root/searchlib/src
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@broadpark.no>2019-08-02 15:03:29 +0200
committerTor Egge <Tor.Egge@broadpark.no>2019-08-02 15:03:29 +0200
commita3bc91ece571131f423bb27e69ed25199182ad15 (patch)
tree6176fbb370155debdcf5eaf0c2d046e43d3cf7fa /searchlib/src
parent77e409c8790df9ed6e626b57714ed71770d47d66 (diff)
Suppress clang warnings.
Diffstat (limited to 'searchlib/src')
-rw-r--r--searchlib/src/tests/queryeval/queryeval.cpp7
-rw-r--r--searchlib/src/vespa/searchlib/attribute/multi_value_mapping.hpp7
-rw-r--r--searchlib/src/vespa/searchlib/expression/functionnodes.cpp7
3 files changed, 21 insertions, 0 deletions
diff --git a/searchlib/src/tests/queryeval/queryeval.cpp b/searchlib/src/tests/queryeval/queryeval.cpp
index db7f8d1cda1..56c6f7e1282 100644
--- a/searchlib/src/tests/queryeval/queryeval.cpp
+++ b/searchlib/src/tests/queryeval/queryeval.cpp
@@ -575,7 +575,14 @@ getExpectedSlime() {
}
TEST("testDump") {
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
typedef SourceBlenderSearch::Child Source;
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
SearchIterator::UP search(
AndSearch::create(
Collect<SearchIterator*, MultiSearch::Children>()
diff --git a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.hpp b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.hpp
index eb4d5fadd2a..4460d1757a2 100644
--- a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.hpp
@@ -11,7 +11,14 @@ namespace search::attribute {
template <typename EntryT, typename RefT>
MultiValueMapping<EntryT,RefT>::MultiValueMapping(const datastore::ArrayStoreConfig &storeCfg,
const vespalib::GrowStrategy &gs)
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wuninitialized"
+#endif
: MultiValueMappingBase(gs, _store.getGenerationHolder()),
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
_store(storeCfg)
{
}
diff --git a/searchlib/src/vespa/searchlib/expression/functionnodes.cpp b/searchlib/src/vespa/searchlib/expression/functionnodes.cpp
index 93655ec2925..0eb85cba4ba 100644
--- a/searchlib/src/vespa/searchlib/expression/functionnodes.cpp
+++ b/searchlib/src/vespa/searchlib/expression/functionnodes.cpp
@@ -212,7 +212,14 @@ void MultiArgFunctionNode::onPrepareResult()
} else if (_args.size() > 1) {
setResultType(std::unique_ptr<ResultNode>(static_cast<ResultNode *>(_args[0]->getResult().clone())));
for(size_t i(1), m(_args.size()); i < m; i++) {
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-undefined-compare"
+#endif
if (&_args[i]->getResult() != NULL) {
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
setResultType(_ArithmeticTypeConversion.getType(getResult(), _args[i]->getResult()));
}
}