diff options
| author | Ryan Prichard <rprichard@google.com> | 2023-09-20 20:48:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-09-20 20:48:46 +0000 |
| commit | d0210ae77cd0cee7e2d1b66f774581727eaf565d (patch) | |
| tree | 0c085351dbc5fd2cea90f8fa5b451b8c567ec0e5 | |
| parent | 101d502358fca757c7df2a94d551a0b07f84781e (diff) | |
| parent | d18fb58c2f2b903bebc89ebfbdf4bfac164b143b (diff) | |
| download | clang-d0210ae77cd0cee7e2d1b66f774581727eaf565d.tar.gz | |
Merge "Don't discard the result of std::unique" into main
| -rw-r--r-- | include/clang/Serialization/ContinuousRangeMap.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/include/clang/Serialization/ContinuousRangeMap.h b/include/clang/Serialization/ContinuousRangeMap.h index 244b01b22a..edc42441b2 100644 --- a/include/clang/Serialization/ContinuousRangeMap.h +++ b/include/clang/Serialization/ContinuousRangeMap.h @@ -117,14 +117,17 @@ public: ~Builder() { std::sort(Self.Rep.begin(), Self.Rep.end(), Compare()); - std::unique(Self.Rep.begin(), Self.Rep.end(), - [](const_reference A, const_reference B) { - // FIXME: we should not allow any duplicate keys, but there are a lot of - // duplicate 0 -> 0 mappings to remove first. - assert((A == B || A.first != B.first) && - "ContinuousRangeMap::Builder given non-unique keys"); - return A == B; - }); + Self.Rep.erase( + std::unique( + Self.Rep.begin(), Self.Rep.end(), + [](const_reference A, const_reference B) { + // FIXME: we should not allow any duplicate keys, but there are + // a lot of duplicate 0 -> 0 mappings to remove first. + assert((A == B || A.first != B.first) && + "ContinuousRangeMap::Builder given non-unique keys"); + return A == B; + }), + Self.Rep.end()); } void insert(const value_type &Val) { |