From: Václav Slavík Date: Mon, 26 Mar 2007 08:25:47 +0000 (+0000) Subject: added missing operators to wxString::reverse_iterator X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/92d21a8a07cdd029af796469c2a959c1c393baf3?ds=inline added missing operators to wxString::reverse_iterator git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/string.h b/include/wx/string.h index bc55fadaa4..ae60ab5125 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -432,11 +432,40 @@ public: reverse_iterator_impl operator--(int) { reverse_iterator_impl tmp = *this; ++m_cur; return tmp; } + reverse_iterator_impl operator+(int n) const + { return reverse_iterator_impl(m_cur - n); } + reverse_iterator_impl operator+(size_t n) const + { return reverse_iterator_impl(m_cur - n); } + reverse_iterator_impl operator-(int n) const + { return reverse_iterator_impl(m_cur + n); } + reverse_iterator_impl operator-(size_t n) const + { return reverse_iterator_impl(m_cur + n); } + reverse_iterator_impl operator+=(int n) + { m_cur -= n; return *this; } + reverse_iterator_impl operator+=(size_t n) + { m_cur -= n; return *this; } + reverse_iterator_impl operator-=(int n) + { m_cur += n; return *this; } + reverse_iterator_impl operator-=(size_t n) + { m_cur += n; return *this; } + + unsigned operator-(const reverse_iterator_impl& i) const + { return i.m_cur - m_cur; } + bool operator==(const reverse_iterator_impl& ri) const { return m_cur == ri.m_cur; } bool operator!=(const reverse_iterator_impl& ri) const { return !(*this == ri); } + bool operator<(const reverse_iterator_impl& i) const + { return m_cur > i.m_cur; } + bool operator>(const reverse_iterator_impl& i) const + { return m_cur < i.m_cur; } + bool operator<=(const reverse_iterator_impl& i) const + { return m_cur >= i.m_cur; } + bool operator>=(const reverse_iterator_impl& i) const + { return m_cur <= i.m_cur; } + private: iterator_type m_cur; };