Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-29 16:37:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to using prefix increment in make_iterator

Browse Source
This commit is contained in:
Ivan Smirnov 2016-06-17 22:29:39 +01:00
parent 3ae5bd787f
commit daed1abc9c
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/pybind11/pybind11.h
View File

@ -1028,7 +1028,10 @@ PYBIND11_NOINLINE inline void keep_alive_impl(int Nurse, int Patient, handle arg
(void) wr.release(); (void) wr.release();
} }
template <typename Iterator> struct iterator_state { Iterator it, end; }; template <typename Iterator> struct iterator_state {
Iterator it, end;
bool first;
};
NAMESPACE_END(detail) NAMESPACE_END(detail)
@ -1044,13 +1047,17 @@ iterator make_iterator(Iterator first, Iterator last, Extra &&... extra) {
class_<state>(handle(), "") class_<state>(handle(), "")
.def("__iter__", [](state &s) -> state& { return s; }) .def("__iter__", [](state &s) -> state& { return s; })
.def("__next__", [](state &s) -> ValueType { .def("__next__", [](state &s) -> ValueType {
if (!s.first)
++s.it;
else
s.first = false;
if (s.it == s.end) if (s.it == s.end)
throw stop_iteration(); throw stop_iteration();
return *s.it++; return *s.it;
}, return_value_policy::reference_internal, std::forward<Extra>(extra)...); }, return_value_policy::reference_internal, std::forward<Extra>(extra)...);
} }
return (iterator) cast(state { first, last }); return (iterator) cast(state { first, last, true });
} }
template <typename Type, typename... Extra> iterator make_iterator(Type &value, Extra&&... extra) { template <typename Type, typename... Extra> iterator make_iterator(Type &value, Extra&&... extra) {