RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 04:32:44 +01:00
Code Issues Projects Releases Wiki Activity

Fix possible compilation issue with gcc-11

Browse Source
This commit is contained in:
Nekotekina 2021-01-09 09:43:37 +03:00
parent cb7748dfa0
commit 716bb292ba
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/llvm/ADT/STLExtras.h
View File

@ -1790,9 +1790,9 @@ template <typename R> struct result_pair {
result_pair(std::size_t Index, IterOfRange<R> Iter) result_pair(std::size_t Index, IterOfRange<R> Iter)
: Index(Index), Iter(Iter) {} : Index(Index), Iter(Iter) {}
result_pair<R>(const result_pair<R> &Other) result_pair(const result_pair &Other)
: Index(Other.Index), Iter(Other.Iter) {} : Index(Other.Index), Iter(Other.Iter) {}
result_pair<R> &operator=(const result_pair<R> &Other) { result_pair &operator=(const result_pair &Other) {
Index = Other.Index; Index = Other.Index;
Iter = Other.Iter; Iter = Other.Iter;
return *this; return *this;
@ -1826,22 +1826,22 @@ public:
result_type &operator*() { return Result; } result_type &operator*() { return Result; }
const result_type &operator*() const { return Result; } const result_type &operator*() const { return Result; }
enumerator_iter<R> &operator++() { enumerator_iter &operator++() {
assert(Result.Index != std::numeric_limits<size_t>::max()); assert(Result.Index != std::numeric_limits<size_t>::max());
++Result.Iter; ++Result.Iter;
++Result.Index; ++Result.Index;
return *this; return *this;
} }
bool operator==(const enumerator_iter<R> &RHS) const { bool operator==(const enumerator_iter &RHS) const {
// Don't compare indices here, only iterators. It's possible for an end // Don't compare indices here, only iterators. It's possible for an end
// iterator to have different indices depending on whether it was created // iterator to have different indices depending on whether it was created
// by calling std::end() versus incrementing a valid iterator. // by calling std::end() versus incrementing a valid iterator.
return Result.Iter == RHS.Result.Iter; return Result.Iter == RHS.Result.Iter;
} }
enumerator_iter<R>(const enumerator_iter<R> &Other) : Result(Other.Result) {} enumerator_iter(const enumerator_iter &Other) : Result(Other.Result) {}
enumerator_iter<R> &operator=(const enumerator_iter<R> &Other) { enumerator_iter &operator=(const enumerator_iter &Other) {
Result = Other.Result; Result = Other.Result;
return *this; return *this;
} }