diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-08 13:13:08 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-03-16 15:20:15 +0100 |
| commit | 9650eff615a19f2cda06760b2e475b24e8faae2b (patch) | |
| tree | d6f721dc42817e673e31fd1dff72500d31762553 /chromium/base/win/enum_variant.cc | |
| parent | 293f42fdc453074c627a62829602421e0ff75be6 (diff) | |
| download | qtwebengine-chromium-9650eff615a19f2cda06760b2e475b24e8faae2b.tar.gz | |
Fix misuse of {} initialization
Narrowing is supposed to be forbidden in {} initialization, but Chromium
doesn't appear to care upstream.
Change-Id: Ia3d1dac6ef19ef86afcbeee4ed11d807c53faaaa
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/base/win/enum_variant.cc')
| -rw-r--r-- | chromium/base/win/enum_variant.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chromium/base/win/enum_variant.cc b/chromium/base/win/enum_variant.cc index 654cfc67c13..8c845406862 100644 --- a/chromium/base/win/enum_variant.cc +++ b/chromium/base/win/enum_variant.cc @@ -35,7 +35,7 @@ HRESULT EnumVariant::Next(ULONG requested_count, return E_INVALIDARG; DCHECK_LE(current_index_, items_.size()); - ULONG available_count = ULONG{items_.size()} - current_index_; + ULONG available_count = ULONG(items_.size()) - current_index_; ULONG count = std::min(requested_count, available_count); for (ULONG i = 0; i < count; ++i) out_elements[i] = items_[current_index_ + i].Copy(); @@ -51,8 +51,8 @@ HRESULT EnumVariant::Next(ULONG requested_count, HRESULT EnumVariant::Skip(ULONG skip_count) { ULONG count = skip_count; - if (current_index_ + count > ULONG{items_.size()}) - count = ULONG{items_.size()} - current_index_; + if (current_index_ + count > ULONG(items_.size())) + count = ULONG(items_.size()) - current_index_; current_index_ += count; return (count == skip_count ? S_OK : S_FALSE); @@ -69,7 +69,7 @@ HRESULT EnumVariant::Clone(IEnumVARIANT** out_cloned_object) { size_t count = items_.size(); Microsoft::WRL::ComPtr<EnumVariant> other = - Microsoft::WRL::Make<EnumVariant>(ULONG{count}); + Microsoft::WRL::Make<EnumVariant>(ULONG(count)); for (size_t i = 0; i < count; ++i) other->items_[i] = static_cast<const VARIANT&>(items_[i]); |