1 files changed, 29 insertions, 4 deletions

diff --git a/src/set.h b/src/set.h
index 42f9eb8..a25b0bf 100644
--- a/src/set.h
+++ b/src/set.h
@@ -322,7 +322,7 @@ namespace Bu
                         /**
                          * Iterator equality comparison operator. Iterators the same?
                          */
-                        bool operator==( const iterator &oth )
+                        bool operator==( const iterator &oth ) const
                         {
                                 if( bFinished != oth.bFinished )
                                         return false;
@@ -341,7 +341,7 @@ namespace Bu
                         /**
                          * Iterator not equality comparison operator. Not the same?
                          */
-                        bool operator!=( const iterator &oth )
+                        bool operator!=( const iterator &oth ) const
                         {
                                 return !(*this == oth );
                         }
@@ -366,6 +366,21 @@ namespace Bu
                         {
                                 return hsh.getKeyAtPos( nPos );
                         }
+
+                        const key &operator *() const
+                        {
+                                return hsh.getKeyAtPos( nPos );
+                        }
+
+                        bool isValid() const
+                        {
+                                return !bFinished;
+                        }
+
+                        operator bool() const
+                        {
+                                return !bFinished;
+                        }
                 } iterator;
                 
                 /**
@@ -420,7 +435,7 @@ namespace Bu
                         /**
                          * Iterator equality comparison operator. Iterators the same?
                          */
-                        bool operator==( const const_iterator &oth )
+                        bool operator==( const const_iterator &oth ) const
                         {
                                 if( bFinished != oth.bFinished )
                                         return false;
@@ -439,7 +454,7 @@ namespace Bu
                         /**
                          * Iterator not equality comparison operator. Not the same?
                          */
-                        bool operator!=( const const_iterator &oth )
+                        bool operator!=( const const_iterator &oth ) const
                         {
                                 return !(*this == oth );
                         }
@@ -464,6 +479,16 @@ namespace Bu
                         {
                                 return hsh.getKeyAtPos( nPos );
                         }
+
+                        bool isValid() const
+                        {
+                                return !bFinished;
+                        }
+
+                        operator bool() const
+                        {
+                                return !bFinished;
+                        }
                 } const_iterator;
 
                 /**