minor fixes and making compiler a bit happier

Signed-off-by: Michael Krelin <hacker@klever.net>

1 files changed, 9 insertions, 10 deletions

diff --git a/include/opkele/iterator.h b/include/opkele/iterator.h
index 812a786..28c1c83 100644
--- a/include/opkele/iterator.h
+++ b/include/opkele/iterator.h
@@ -28,3 +28,3 @@ namespace opkele {
 
-		output_iterator_proxy_impl(const IT& i) : i(i) { }
+		output_iterator_proxy_impl(const IT& _i) : i(_i) { }
 		basic_output_iterator_proxy_impl<T>* dup() const {
@@ -32,4 +32,3 @@ namespace opkele {
 		basic_output_iterator_proxy_impl<T>& operator=(const T& x) {
-		    (*i) = x;
-		}
+		    (*i) = x; return *this; }
 	};
@@ -53,3 +52,3 @@ namespace opkele {
 		output_iterator_proxy& operator=(const T& x) {
-		    (**I) = x; }
+		    (**I) = x; return *this; }
 
@@ -79,3 +78,3 @@ namespace opkele {
 
-		forward_iterator_proxy_impl(const IT& i) : i(i) { }
+		forward_iterator_proxy_impl(const IT& _i) : i(_i) { }
 
@@ -138,4 +137,4 @@ namespace opkele {
 		    basic_filterator() : empty(true) { }
-		    basic_filterator(const IT& bi,const IT& ei)
-			: it(bi), ei(ei) { empty = (bi==ei); }
+		    basic_filterator(const IT& _bi,const IT& _ei)
+			: it(_bi), ei(_ei) { empty = (it==ei); }
 		    basic_filterator(const basic_filterator<IT>& x)
@@ -187,5 +186,5 @@ namespace opkele {
 		    map_keys_iterator() : empty(true) { }
-		    map_keys_iterator(const IT& bi,
-			    const IT& ei)
-			: it(bi), ei(ei) { empty = (bi==ei); }
+		    map_keys_iterator(const IT& _bi,
+			    const IT& _ei)
+			: it(_bi), ei(_ei) { empty = (it==ei); }
 		    map_keys_iterator(const self_type& x)