diff options
| author | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2023-10-19 19:13:47 +0200 |
|---|---|---|
| committer | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2023-12-15 13:14:59 +0100 |
| commit | 1a1c06dfebc470caa47dcc8b5c689f44f2bb82e2 (patch) | |
| tree | 9771a7d9ca9444bcefe181fcb0884ce4528f955c /core/templates | |
| parent | fec76d0c225441b54939d8abb4334fb11a4899fd (diff) | |
| download | redot-engine-1a1c06dfebc470caa47dcc8b5c689f44f2bb82e2.tar.gz | |
RBMap: Add explicit copy operators to iterators
Absence thereof is deprecated and breaks builds on most compilers.
Bonus: Fix parameter naming style throughout.
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/rb_map.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/core/templates/rb_map.h b/core/templates/rb_map.h index d373713669..152fddd011 100644 --- a/core/templates/rb_map.h +++ b/core/templates/rb_map.h @@ -111,11 +111,16 @@ public: return *this; } - _FORCE_INLINE_ bool operator==(const Iterator &b) const { return E == b.E; } - _FORCE_INLINE_ bool operator!=(const Iterator &b) const { return E != b.E; } + _FORCE_INLINE_ bool operator==(const Iterator &p_it) const { return E == p_it.E; } + _FORCE_INLINE_ bool operator!=(const Iterator &p_it) const { return E != p_it.E; } explicit operator bool() const { return E != nullptr; } + + Iterator &operator=(const Iterator &p_it) { + E = p_it.E; + return *this; + } Iterator(Element *p_E) { E = p_E; } Iterator() {} Iterator(const Iterator &p_it) { E = p_it.E; } @@ -138,11 +143,16 @@ public: return *this; } - _FORCE_INLINE_ bool operator==(const ConstIterator &b) const { return E == b.E; } - _FORCE_INLINE_ bool operator!=(const ConstIterator &b) const { return E != b.E; } + _FORCE_INLINE_ bool operator==(const ConstIterator &p_it) const { return E == p_it.E; } + _FORCE_INLINE_ bool operator!=(const ConstIterator &p_it) const { return E != p_it.E; } explicit operator bool() const { return E != nullptr; } + + ConstIterator &operator=(const ConstIterator &p_it) { + E = p_it.E; + return *this; + } ConstIterator(const Element *p_E) { E = p_E; } ConstIterator() {} ConstIterator(const ConstIterator &p_it) { E = p_it.E; } |