From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 7 Nov 2012 01:43:16 +0000 (+1300)
Subject: Polish: improve const correctness on Squid vector<> implementation
X-Git-Tag: SQUID_3_4_0_1~529
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87cd380e9a0616491644f95664ecce58925d5965;p=thirdparty%2Fsquid.git

Polish: improve const correctness on Squid vector<> implementation

This update allows == and != operators to be used with const_iterator
and removes the need for many implicit conversions safely.
---

diff --git a/include/Array.h b/include/Array.h
index 8cee5fa144..8b083b1cc1 100644
--- a/include/Array.h
+++ b/include/Array.h
@@ -52,8 +52,8 @@ public:
     VectorIteratorBase(C &);
     VectorIteratorBase(size_t, C &);
     VectorIteratorBase & operator =(VectorIteratorBase const &);
-    bool operator != (VectorIteratorBase const &rhs);
-    bool operator == (VectorIteratorBase const &rhs);
+    bool operator != (VectorIteratorBase const &rhs) const;
+    bool operator == (VectorIteratorBase const &rhs) const;
     VectorIteratorBase & operator ++();
     VectorIteratorBase operator ++(int);
     typename C::value_type & operator *() const {
@@ -386,14 +386,14 @@ template<class C>
 VectorIteratorBase<C>::VectorIteratorBase(size_t aPos, C &container) : pos(aPos), theVector(&container) {}
 
 template<class C>
-bool VectorIteratorBase<C>:: operator != (VectorIteratorBase<C> const &rhs)
+bool VectorIteratorBase<C>:: operator != (VectorIteratorBase<C> const &rhs) const
 {
     assert (theVector);
     return pos != rhs.pos;
 }
 
 template<class C>
-bool VectorIteratorBase<C>:: operator == (VectorIteratorBase<C> const &rhs)
+bool VectorIteratorBase<C>:: operator == (VectorIteratorBase<C> const &rhs) const
 {
     assert (theVector);
     return pos == rhs.pos;