diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-10 16:19:40 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-10 16:01:50 +0000 |
commit | 51f6c2793adab2d864b3d2b360000ef8db1d3e92 (patch) | |
tree | 835b3b4446b012c75e80177cef9fbe6972cc7dbe /chromium/base/values.cc | |
parent | 6036726eb981b6c4b42047513b9d3f4ac865daac (diff) |
BASELINE: Update Chromium to 71.0.3578.93
Change-Id: I6a32086c33670e1b033f8b10e6bf1fd4da1d105d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/base/values.cc')
-rw-r--r-- | chromium/base/values.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chromium/base/values.cc b/chromium/base/values.cc index cab1fedc5e0..3349f74abfb 100644 --- a/chromium/base/values.cc +++ b/chromium/base/values.cc @@ -374,12 +374,12 @@ Value* Value::SetPath(std::initializer_list<StringPiece> path, Value value) { } Value* Value::SetPath(span<const StringPiece> path, Value value) { - DCHECK_NE(path.begin(), path.end()); // Can't be empty path. + DCHECK(path.begin() != path.end()); // Can't be empty path. // Walk/construct intermediate dictionaries. The last element requires // special handling so skip it in this loop. Value* cur = this; - const StringPiece* cur_path = path.begin(); + auto cur_path = path.begin(); for (; (cur_path + 1) < path.end(); ++cur_path) { if (!cur->is_dict()) return nullptr; @@ -486,7 +486,8 @@ bool Value::GetAsDouble(double* out_value) const { if (out_value && is_double()) { *out_value = double_value_; return true; - } else if (out_value && is_int()) { + } + if (out_value && is_int()) { // Allow promotion from int to double. *out_value = int_value_; return true; |