diff options
| author | Kelvin Zhang <zhangkelvin@google.com> | 2021-11-01 19:27:26 -0700 |
|---|---|---|
| committer | Kelvin Zhang <zhangkelvin@google.com> | 2021-11-02 02:38:22 +0000 |
| commit | a90c04389f86ed4363674e20b0d5f171dea7ebeb (patch) | |
| tree | 0a310ca653ef73c547d80da63c87fcb2c0636bcb /target_pool.cc | |
| parent | f2da819cb37cb2376c917506fb1eb154ec61586a (diff) | |
| parent | 8bb965d29e918d0559589a215ff7f4bd0874bc08 (diff) | |
| download | zucchini-a90c04389f86ed4363674e20b0d5f171dea7ebeb.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-main' into dev
This performs a merge on upstream zucchini.
Change-Id: I8a4844407558d6f1e439939ee634fe17ed7a4e55
Diffstat (limited to 'target_pool.cc')
| -rw-r--r-- | target_pool.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target_pool.cc b/target_pool.cc index 23551fd..e15d0b9 100644 --- a/target_pool.cc +++ b/target_pool.cc @@ -16,7 +16,7 @@ namespace zucchini { TargetPool::TargetPool() = default; -TargetPool::TargetPool(std::vector<offset_t>&& targets) { +TargetPool::TargetPool(std::deque<offset_t>&& targets) { DCHECK(targets_.empty()); DCHECK(std::is_sorted(targets.begin(), targets.end())); targets_ = std::move(targets); |