summaryrefslogtreecommitdiffstats
path: root/document
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-05-28 11:06:40 +0200
committerJon Bratseth <bratseth@oath.com>2018-05-28 11:06:40 +0200
commit919d746ba513859cad11839b553ac6bb691a370d (patch)
treef455d364b16bd866f869d01171900475ad38a82a /document
parentda778405d6e8888f0f90444dc4a3610c5bf9f1bc (diff)
parente7203cce8fa1092c501784cd50d3e559ff2f0020 (diff)
Merge with master
Diffstat (limited to 'document')
-rw-r--r--document/src/vespa/document/select/valuenodes.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/document/src/vespa/document/select/valuenodes.cpp b/document/src/vespa/document/select/valuenodes.cpp
index 837ebd873e3..f9cf3472110 100644
--- a/document/src/vespa/document/select/valuenodes.cpp
+++ b/document/src/vespa/document/select/valuenodes.cpp
@@ -905,7 +905,7 @@ ArithmeticValueNode::getValue(std::unique_ptr<Value> lval,
slval.getValue() + srval.getValue()));
}
}
- //@fallthrough@
+ [[fallthrough]];
case SUB:
case MUL:
case DIV:
@@ -995,7 +995,7 @@ ArithmeticValueNode::traceValue(std::unique_ptr<Value> lval,
return result;
}
}
- //@fallthrough@
+ [[fallthrough]];
case SUB:
case MUL:
case DIV: