diff options
| author | Kelvin Zhang <zhangkelvin@google.com> | 2021-11-02 21:56:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-02 21:56:43 +0000 |
| commit | 8be98142ecdba40b2ea9be10b11a23f4e6b67b05 (patch) | |
| tree | 0a310ca653ef73c547d80da63c87fcb2c0636bcb /algorithm.h | |
| parent | b77318bc7ecfba25e4966b56b9e9ab593925ad9d (diff) | |
| parent | 7be427590935bc88198d32004449ccfcf60b60d4 (diff) | |
| download | zucchini-8be98142ecdba40b2ea9be10b11a23f4e6b67b05.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-main' into dev am: a90c04389f am: ddc43dc959 am: d9eed84a58 am: 58b4d19a6b am: 7be4275909
Original change: https://android-review.googlesource.com/c/platform/external/zucchini/+/1877854
Change-Id: Ifdb1f7882cc237258a3395d28158d50bb4b43136
Diffstat (limited to 'algorithm.h')
| -rw-r--r-- | algorithm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/algorithm.h b/algorithm.h index f5d49e3..4cafe93 100644 --- a/algorithm.h +++ b/algorithm.h @@ -8,6 +8,7 @@ #include <stddef.h> #include <algorithm> +#include <deque> #include <type_traits> #include <vector> @@ -69,7 +70,7 @@ inline int IncrementForAlignCeil4(T pos) { // Sorts values in |container| and removes duplicates. template <class T> -void SortAndUniquify(std::vector<T>* container) { +void SortAndUniquify(std::deque<T>* container) { std::sort(container->begin(), container->end()); container->erase(std::unique(container->begin(), container->end()), container->end()); |