Ryujinx/moltenvk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2157 from cdavis5e/smallvec-const-correct

Browse Source 
MVKSmallVector: Make iterator const correct.
This commit is contained in:
Bill Hollings 2024-02-12 16:39:47 -05:00 committed by GitHub
commit a62cada021
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
MoltenVK/MoltenVK/Utility/MVKSmallVector.h
View File

@ -86,9 +86,9 @@ public:
return *this; return *this;
} }
Type *operator->() { return &vector->alc.ptr[index]; } Type *operator->() const { return &vector->alc.ptr[index]; }
Type &operator*() { return vector->alc.ptr[index]; } Type &operator*() const { return vector->alc.ptr[index]; }
operator Type*() { return &vector->alc.ptr[index]; } operator Type*() const { return &vector->alc.ptr[index]; }
bool operator==( const iterator &it ) const { return vector == it.vector && index == it.index; } bool operator==( const iterator &it ) const { return vector == it.vector && index == it.index; }
bool operator!=( const iterator &it ) const { return vector != it.vector || index != it.index; } bool operator!=( const iterator &it ) const { return vector != it.vector || index != it.index; }
@ -98,20 +98,19 @@ public:
iterator& operator--() { --index; return *this; } iterator& operator--() { --index; return *this; }
iterator operator--( int ) { auto t = *this; --index; return t; } iterator operator--( int ) { auto t = *this; --index; return t; }
iterator operator+ (const diff_type n) { return iterator( index + n, *vector ); } iterator operator+ (const diff_type n) const { return iterator( index + n, *vector ); }
iterator& operator+= (const diff_type n) { index += n; return *this; } iterator& operator+= (const diff_type n) { index += n; return *this; }
iterator operator- (const diff_type n) { return iterator( index - n, *vector ); } iterator operator- (const diff_type n) const { return iterator( index - n, *vector ); }
iterator& operator-= (const diff_type n) { index -= n; return *this; } iterator& operator-= (const diff_type n) { index -= n; return *this; }
diff_type operator- (const iterator& it) { return index - it.index; } diff_type operator- (const iterator& it) const { return index - it.index; }
bool operator< (const iterator& it) { return index < it.index; } bool operator< (const iterator& it) const { return index < it.index; }
bool operator<= (const iterator& it) { return index <= it.index; } bool operator<= (const iterator& it) const { return index <= it.index; }
bool operator> (const iterator& it) { return index > it.index; } bool operator> (const iterator& it) const { return index > it.index; }
bool operator>= (const iterator& it) { return index >= it.index; } bool operator>= (const iterator& it) const { return index >= it.index; }
const Type &operator[]( const diff_type i ) const { return vector->alc.ptr[index + i]; } Type &operator[]( const diff_type i ) const { return vector->alc.ptr[index + i]; }
Type &operator[]( const diff_type i ) { return vector->alc.ptr[index + i]; }
bool is_valid() const { return index < vector->alc.size(); } bool is_valid() const { return index < vector->alc.size(); }
size_t get_position() const { return index; } size_t get_position() const { return index; }