[Ecell-cvs] SF.net SVN: ecell:[3878] ecell3/trunk/ecell/pyecell/ecell/_ecs.cpp

[<mor...@us...>]

Revision: 3878
          http://ecell.svn.sourceforge.net/ecell/?rev=3878&view=rev
Author:   moriyoshi
Date:     2010-12-21 08:29:57 +0000 (Tue, 21 Dec 2010)

Log Message:
-----------
* Fix iter(process.variableReferences)

Modified Paths:
--------------
    ecell3/trunk/ecell/pyecell/ecell/_ecs.cpp

Modified: ecell3/trunk/ecell/pyecell/ecell/_ecs.cpp
===================================================================
--- ecell3/trunk/ecell/pyecell/ecell/_ecs.cpp	2010-12-21 08:27:55 UTC (rev 3877)
+++ ecell3/trunk/ecell/pyecell/ecell/_ecs.cpp	2010-12-21 08:29:57 UTC (rev 3878)
@@ -959,9 +959,9 @@
     }
 
     template< typename Trange_ >
-    static STLIteratorWrapper* create( Trange_ const& range )
+    static PyObject* create( Trange_ const& range )
     {
-        return new STLIteratorWrapper( range );
+        return reinterpret_cast< PyObject* >( new STLIteratorWrapper( range ) );
     }
 
     static void __dealloc__( STLIteratorWrapper* self )
@@ -974,7 +974,7 @@
         if ( self->theIdx == self->theEnd )
             return NULL;
 
-        return py::incref( py::object( *self->theIdx ).ptr() );
+        return py::incref( py::object( *( self->theIdx++ ) ).ptr() );
     }
 };
 
@@ -1269,9 +1269,9 @@
         return retval;
     }
 
-    py::object __iter__()
+    PyObject* __iter__()
     {
-        return py::object( STLIteratorWrapper< Process::VariableReferenceVector::const_iterator >( theProc->getVariableReferenceVector() ) );
+        return STLIteratorWrapper< Process::VariableReferenceVector::const_iterator >::create( theProc->getVariableReferenceVector() );
     }
 
     std::string __str__()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.