diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-01 14:04:03 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-01 12:10:12 +0000 |
| commit | 6c2d06e606435acd04f94f8b0e72dd6c955db30d (patch) | |
| tree | 50acf55b6f05345877ff5dd12312c45b1350ea2a | |
| parent | 72b4b6fc4ee4bac922447bb5262b3b9e5e5fc872 (diff) | |
Fix Windows 32bit build
Change-Id: I55fa0294454a4b5a9bc2ac4d103b001a55d380a3
Fixes: QTBUG-74854
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| -rw-r--r-- | chromium/gpu/command_buffer/service/wrapped_sk_image.cc | 2 | ||||
| -rw-r--r-- | chromium/net/third_party/quic/core/qpack/qpack_header_table.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chromium/gpu/command_buffer/service/wrapped_sk_image.cc b/chromium/gpu/command_buffer/service/wrapped_sk_image.cc index b551da60f9d..3cb2eab4986 100644 --- a/chromium/gpu/command_buffer/service/wrapped_sk_image.cc +++ b/chromium/gpu/command_buffer/service/wrapped_sk_image.cc @@ -155,7 +155,7 @@ class WrappedSkImage : public SharedImageBacking { case GrBackendApi::kVulkan: { GrVkImageInfo image_info; if (gr_texture.getVkImageInfo(&image_info)) - tracing_id_ = reinterpret_cast<uint64_t>(image_info.fImage); + tracing_id_ = static_cast<uint64_t>(image_info.fImage); break; } default: diff --git a/chromium/net/third_party/quic/core/qpack/qpack_header_table.cc b/chromium/net/third_party/quic/core/qpack/qpack_header_table.cc index db5308c7835..1cb4b54f932 100644 --- a/chromium/net/third_party/quic/core/qpack/qpack_header_table.cc +++ b/chromium/net/third_party/quic/core/qpack/qpack_header_table.cc @@ -108,7 +108,7 @@ const QpackEntry* QpackHeaderTable::InsertEntry(QuicStringPiece name, } const uint64_t index = dropped_entry_count_ + dynamic_entries_.size(); - dynamic_entries_.push_back({name, value, /* is_static = */ false, index}); + dynamic_entries_.push_back({name, value, /* is_static = */ false, static_cast<size_t>(index)}); QpackEntry* const new_entry = &dynamic_entries_.back(); // Evict entries after inserting the new entry instead of before |