diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-07-24 14:17:35 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-07-24 14:17:35 +0000 |
| commit | b4be762630e273ab8913261ad8b2a0a38353de2f (patch) | |
| tree | 25cd74dcfc4175a258e0c9c86a082b3a128bf407 /document/src | |
| parent | 761677c3f844527aa67c75e718b05d13e7ff3386 (diff) | |
Use syntax that works for both gcc 7 and gcc 6.
Diffstat (limited to 'document/src')
| -rw-r--r-- | document/src/vespa/document/select/valuenodes.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/document/src/vespa/document/select/valuenodes.cpp b/document/src/vespa/document/select/valuenodes.cpp index d334f4b955e..4c6f5246fde 100644 --- a/document/src/vespa/document/select/valuenodes.cpp +++ b/document/src/vespa/document/select/valuenodes.cpp @@ -999,8 +999,8 @@ ArithmeticValueNode::getValue(std::unique_ptr<Value> lval, return std::unique_ptr<Value>(new StringValue( slval.getValue() + srval.getValue())); } - [[fallthrough]]; } + //@fallthrough@ case SUB: case MUL: case DIV: @@ -1049,8 +1049,8 @@ ArithmeticValueNode::getValue(std::unique_ptr<Value> lval, } return std::unique_ptr<Value>(new FloatValue(res)); } - [[fallthrough]]; } + //@fallthrough@ case MOD: { if (lval->getType() == Value::Integer && @@ -1064,8 +1064,8 @@ ArithmeticValueNode::getValue(std::unique_ptr<Value> lval, throw vespalib::IllegalArgumentException("Division by zero"); } } - [[fallthrough]]; } + //@fallthrough@ } return std::unique_ptr<Value>(new InvalidValue); } @@ -1089,8 +1089,8 @@ ArithmeticValueNode::traceValue(std::unique_ptr<Value> lval, << "' -> '" << *result << "'.\n"; return result; } - [[fallthrough]]; } + //@fallthrough@ case SUB: case MUL: case DIV: @@ -1135,8 +1135,8 @@ ArithmeticValueNode::traceValue(std::unique_ptr<Value> lval, << "\n"; return result; } - [[fallthrough]]; } + //@fallthrough@ case MOD: { if (lval->getType() == Value::Integer && @@ -1151,8 +1151,8 @@ ArithmeticValueNode::traceValue(std::unique_ptr<Value> lval, << "\n"; return result; } - [[fallthrough]]; } + //@fallthrough@ } out << "Failed to do operation " << getOperatorName() << " on values of type " << lval->getType() << " and " |