Avoid bitwise or of different enum types.

3 files changed, 8 insertions, 8 deletions

diff --git a/searchlib/src/tests/query/stackdumpquerycreator_test.cpp b/searchlib/src/tests/query/stackdumpquerycreator_test.cpp
index 7f682b380bf..cb3989387b7 100644
--- a/searchlib/src/tests/query/stackdumpquerycreator_test.cpp
+++ b/searchlib/src/tests/query/stackdumpquerycreator_test.cpp
@@ -32,9 +32,9 @@ void appendString(RawBuf &buf, const string &s) {
 }
 
 void appendNumTerm(RawBuf &buf, const string &term_string) {
-    uint8_t typefield = ParseItem::ITEM_NUMTERM |
-                         ParseItem::IF_WEIGHT |
-                         ParseItem::IF_UNIQUEID;
+    uint8_t typefield = static_cast<uint8_t>(ParseItem::ITEM_NUMTERM) |
+                        static_cast<uint8_t>(ParseItem::IF_WEIGHT) |
+                        static_cast<uint8_t>(ParseItem::IF_UNIQUEID);
     buf.append(typefield);
     buf.appendCompressedNumber(2);  // weight
     buf.appendCompressedPositiveNumber(42);  // id
diff --git a/searchlib/src/tests/query/streaming_query_test.cpp b/searchlib/src/tests/query/streaming_query_test.cpp
index 94851c72886..dbd186fdcb5 100644
--- a/searchlib/src/tests/query/streaming_query_test.cpp
+++ b/searchlib/src/tests/query/streaming_query_test.cpp
@@ -226,7 +226,7 @@ public:
     virtual bool getRewriteFloatTerms() const override { return true; }
 };
 
-const char TERM_UNIQ = ParseItem::ITEM_TERM | ParseItem::IF_UNIQUEID;
+const char TERM_UNIQ = static_cast<char>(ParseItem::ITEM_TERM) | static_cast<char>(ParseItem::IF_UNIQUEID);
 
 TEST("e is not rewritten even if allowed") {
     const char term[6] = {TERM_UNIQ, 3, 1, 'c', 1, 'e'};
diff --git a/searchlib/src/vespa/searchlib/query/tree/stackdumpcreator.cpp b/searchlib/src/vespa/searchlib/query/tree/stackdumpcreator.cpp
index 82302e4ab48..9af1ecee224 100644
--- a/searchlib/src/vespa/searchlib/query/tree/stackdumpcreator.cpp
+++ b/searchlib/src/vespa/searchlib/query/tree/stackdumpcreator.cpp
@@ -146,7 +146,7 @@ class QueryNodeConverter : public QueryVisitor {
     }
 
     void visit(Phrase &node) override {
-        createComplexIntermediate(node, node.getChildren(), (ParseItem::ITEM_PHRASE | ParseItem::IF_WEIGHT));
+        createComplexIntermediate(node, node.getChildren(), (static_cast<uint8_t>(ParseItem::ITEM_PHRASE) | static_cast<uint8_t>(ParseItem::IF_WEIGHT)));
     }
 
     template <typename NODE>
@@ -173,17 +173,17 @@ class QueryNodeConverter : public QueryVisitor {
     }
 
     void visit(WeightedSetTerm &node) override {
-        createWeightedSet(node, ParseItem::ITEM_WEIGHTED_SET | ParseItem::IF_WEIGHT);
+        createWeightedSet(node, static_cast<uint8_t>(ParseItem::ITEM_WEIGHTED_SET) | static_cast<uint8_t>(ParseItem::IF_WEIGHT));
         visitNodes(node.getChildren());
     }
 
     void visit(DotProduct &node) override {
-        createWeightedSet(node, ParseItem::ITEM_DOT_PRODUCT | ParseItem::IF_WEIGHT);
+        createWeightedSet(node, static_cast<uint8_t>(ParseItem::ITEM_DOT_PRODUCT) | static_cast<uint8_t>(ParseItem::IF_WEIGHT));
         visitNodes(node.getChildren());
     }
 
     void visit(WandTerm &node) override {
-        createWeightedSet(node, ParseItem::ITEM_WAND | ParseItem::IF_WEIGHT);
+        createWeightedSet(node, static_cast<uint8_t>(ParseItem::ITEM_WAND) | static_cast<uint8_t>(ParseItem::IF_WEIGHT));
         appendCompressedPositiveNumber(node.getTargetNumHits());
         appendDouble(node.getScoreThreshold());
         appendDouble(node.getThresholdBoostFactor());