diff options
| author | Etienne Pierre-doray <etiennep@chromium.org> | 2018-09-10 16:19:33 +0000 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2021-07-25 20:36:14 -0700 |
| commit | 725a8734514bb88b5acd976040e6710e26b2e3b5 (patch) | |
| tree | 15293dbea03b652c5873d1aaebbc2efaf67c88c3 /equivalence_map.cc | |
| parent | 74d44edc92e96d45c2f1d488e42171bb3c55570c (diff) | |
| download | zucchini-725a8734514bb88b5acd976040e6710e26b2e3b5.tar.gz | |
[Zucchini]: Fix OffsetMapper implicit conversion.
Fix compile error with -Wshorten-64-to-32. Image size is new stored as an
offset_t to avoid implicit conversion.
Bug: 881008
Change-Id: I82b12ce17d8368f05d6a5537fd1734ee32b37dbe
Reviewed-on: https://chromium-review.googlesource.com/1213549
Reviewed-by: Samuel Huang <huangs@chromium.org>
Commit-Queue: Etienne Pierre-Doray <etiennep@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589938}
NOKEYCHECK=True
GitOrigin-RevId: 5946dbfa3f684d8f4960bb413b5e8322ebddcee3
Diffstat (limited to 'equivalence_map.cc')
| -rw-r--r-- | equivalence_map.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/equivalence_map.cc b/equivalence_map.cc index 0711bfb..8583e67 100644 --- a/equivalence_map.cc +++ b/equivalence_map.cc @@ -215,8 +215,8 @@ EquivalenceCandidate VisitEquivalenceSeed( /******** OffsetMapper ********/ OffsetMapper::OffsetMapper(std::vector<Equivalence>&& equivalences, - size_t old_image_size, - size_t new_image_size) + offset_t old_image_size, + offset_t new_image_size) : equivalences_(std::move(equivalences)), old_image_size_(old_image_size), new_image_size_(new_image_size) { @@ -229,8 +229,8 @@ OffsetMapper::OffsetMapper(std::vector<Equivalence>&& equivalences, } OffsetMapper::OffsetMapper(EquivalenceSource&& equivalence_source, - size_t old_image_size, - size_t new_image_size) + offset_t old_image_size, + offset_t new_image_size) : old_image_size_(old_image_size), new_image_size_(new_image_size) { DCHECK_GT(new_image_size_, 0U); for (auto e = equivalence_source.GetNext(); e.has_value(); @@ -241,8 +241,8 @@ OffsetMapper::OffsetMapper(EquivalenceSource&& equivalence_source, } OffsetMapper::OffsetMapper(const EquivalenceMap& equivalence_map, - size_t old_image_size, - size_t new_image_size) + offset_t old_image_size, + offset_t new_image_size) : equivalences_(equivalence_map.size()), old_image_size_(old_image_size), new_image_size_(new_image_size) { |