diff options
| author | Kelvin Zhang <zhangkelvin@google.com> | 2021-11-02 21:28:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-02 21:28:18 +0000 |
| commit | 58b4d19a6b6c8a6790c31bb3d6fcd13a8892239b (patch) | |
| tree | 0a310ca653ef73c547d80da63c87fcb2c0636bcb /zucchini_gen_unittest.cc | |
| parent | 919a460e14c48a672288254f67db3e0c28166e82 (diff) | |
| parent | d9eed84a58f90af50d84b02ca6a38d805b425a95 (diff) | |
| download | zucchini-58b4d19a6b6c8a6790c31bb3d6fcd13a8892239b.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-main' into dev am: a90c04389f am: ddc43dc959 am: d9eed84a58
Original change: https://android-review.googlesource.com/c/platform/external/zucchini/+/1877854
Change-Id: I7de3d8374e868066777abb326d3e20c1e4b44803
Diffstat (limited to 'zucchini_gen_unittest.cc')
| -rw-r--r-- | zucchini_gen_unittest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/zucchini_gen_unittest.cc b/zucchini_gen_unittest.cc index 3a6d2cb..bc37bf6 100644 --- a/zucchini_gen_unittest.cc +++ b/zucchini_gen_unittest.cc @@ -6,6 +6,7 @@ #include <stdint.h> +#include <deque> #include <utility> #include <vector> @@ -30,8 +31,8 @@ constexpr double kDummySim = 0.0; std::vector<int32_t> GenerateReferencesDeltaTest( std::vector<Reference>&& old_references, std::vector<Reference>&& new_references, - std::vector<offset_t>&& exp_old_targets, - std::vector<offset_t>&& exp_projected_old_targets, + std::deque<offset_t>&& exp_old_targets, + std::deque<offset_t>&& exp_projected_old_targets, EquivalenceMap&& equivalence_map) { // OffsetMapper needs image sizes for forward-projection overflow check. These // are tested elsewhere, so just use arbitrary large value. |