Changeset 2921 for trunk/src/python_Iterator.cpp

Timestamp:

04/07/14 10:28:37 (10 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: Replaced C++ implementation of python iterator with

STIdxIter2 (was STIdxIterAcc)

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Removed STIdxIter classes except STIdxIter2. Implementation of Python
iterator is replaced with STIdxITer2.

File:

• trunk/src/python_Iterator.cpp (modified) (1 diff)

trunk/src/python_Iterator.cpp

@@ -11 +11 @@
 
     void python_Iterator() {
-      class_<STIdxIterAcc>("iterator")
+      class_<STIdxIter2>("iterator")
         .def( init < const string &, const vector<string> & > () )
-        .def("current", &STIdxIterAcc::currentSTL)
-        .def("pastEnd", &STIdxIterAcc::pastEnd)
-        .def("next", &STIdxIterAcc::next)
-        .def("getrows", &STIdxIterAcc::getRowsSTL)
+#ifdef HAVE_LIBPYRAP
+        .def("current", &STIdxIter2::currentValue)
+#endif
+        .def("pastEnd", &STIdxIter2::pastEnd)
+        .def("next", &STIdxIter2::next)
+        .def("getrows", &STIdxIter2::getRowsSTL)
       ;
     };