merge 0.20.x branch into master

96e9e4d5 · Stefan Behnel · b5a7028a · 0d7a0c2b · 96e9e4d5
Commit 96e9e4d5 authored Jun 14, 2014 by Stefan Behnel
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

Cython/Includes/libcpp/list.pxd Cython/Includes/libcpp/list.pxd +6 -2

No files found.
--- a/Cython/Includes/libcpp/list.pxd
+++ b/Cython/Includes/libcpp/list.pxd
 cdef extern from "<list>" namespace "std" nogil:
    cdef cppclass list[T]:
        cppclass iterator:
+            iterator()
+            iterator(iterator &)
            T& operator*()
            iterator operator++()
            iterator operator--()
            bint operator==(iterator)
            bint operator!=(iterator)
        cppclass reverse_iterator:
+            reverse_iterator()
+            reverse_iterator(iterator &)
            T& operator*()
-            iterator operator++()
+            reverse_iterator operator++()
-            iterator operator--()
+            reverse_iterator operator--()
            bint operator==(reverse_iterator)
            bint operator!=(reverse_iterator)
        #cppclass const_iterator(iterator):