Moved functors away from std_set.i and std_map.i

into their own std_functors.i file.
Made binarypredicate, etc. be templates to allow more
strict predicates/functors.




git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@9815 626c5289-ae23-0410-ae9c-e8d60b6d4f22

1 files changed, 19 insertions, 0 deletions

diff --git a/Lib/ruby/rubyiterators.swg b/Lib/ruby/rubyiterators.swg
index fa70f74d3..b2482a61d 100644
--- a/Lib/ruby/rubyiterators.swg
+++ b/Lib/ruby/rubyiterators.swg
@@ -316,6 +316,10 @@ namespace swig {
     }
 
   public:
+    ConstIterator_T() : ConstIterator(Qnil)
+    {
+    }
+
     ConstIterator_T(const_iter curr, VALUE seq = Qnil)
       : ConstIterator(seq), current(curr)
     {
@@ -326,6 +330,11 @@ namespace swig {
       return current;
     }
 
+    const value_type& operator*() const
+    {
+      return *current;
+    }
+
     virtual VALUE inspect() const
     {
       VALUE ret = rb_str_new2("#<");
@@ -422,6 +431,16 @@ namespace swig {
       *current = b;
       return *this;
     }
+
+    const value_type& operator*() const
+    {
+      return *current;
+    }
+
+    value_type& operator*()
+    {
+      return *current;
+    }
     
     virtual VALUE inspect() const
     {