@@ -5,20 +5,30 @@ cdef extern from "<set>" namespace "std" nogil: |
5 | 5 | ctypedef T value_type |
6 | 6 | cppclass iterator: |
7 | 7 | T& operator*() |
8 | | - iterator operator++() |
9 | | - iterator operator--() |
10 | | - bint operator==(iterator) |
11 | | - bint operator!=(iterator) |
| 8 | + iterator& operator++() |
| 9 | + iterator& operator--() |
| 10 | + bint operator==(const iterator &) |
| 11 | + bint operator!=(const iterator &) |
12 | 12 | cppclass reverse_iterator: |
13 | 13 | T& operator*() |
14 | | - iterator operator++() |
15 | | - iterator operator--() |
16 | | - bint operator==(reverse_iterator) |
17 | | - bint operator!=(reverse_iterator) |
18 | | - cppclass const_iterator(iterator): |
19 | | - pass |
20 | | - cppclass const_reverse_iterator(reverse_iterator): |
21 | | - pass |
| 14 | + reverse_iterator& operator++() |
| 15 | + reverse_iterator& operator--() |
| 16 | + bint operator==(const reverse_iterator&) |
| 17 | + bint operator!=(const reverse_iterator&) |
| 18 | + cppclass const_iterator: |
| 19 | + const_iterator(iterator) |
| 20 | + const T& operator*() |
| 21 | + const_iterator& operator++() |
| 22 | + const_iterator& operator--() |
| 23 | + bint operator==(const const_iterator&) |
| 24 | + bint operator!=(const const_iterator&) |
| 25 | + cppclass const_reverse_iterator: |
| 26 | + const_reverse_iterator(reverse_iterator) |
| 27 | + const T& operator*() |
| 28 | + const_reverse_iterator& operator++() |
| 29 | + const_reverse_iterator& operator--() |
| 30 | + bint operator==(const const_reverse_iterator&) |
| 31 | + bint operator!=(const const_reverse_iterator&) |
22 | 32 | set() except + |
23 | 33 | set(set&) except + |
24 | 34 | #set(key_compare&) |
@@ -37,18 +47,20 @@ cdef extern from "<set>" namespace "std" nogil: |
37 | 47 | iterator end() |
38 | 48 | const_iterator const_end "end"() |
39 | 49 | pair[iterator, iterator] equal_range(const T&) |
40 | | - #pair[const_iterator, const_iterator] equal_range(T&) |
| 50 | + pair[const_iterator, const_iterator] const_equal_range "equal_range"(const T&) |
41 | 51 | iterator erase(iterator) |
42 | | - iterator erase(iterator, iterator) |
43 | | - size_t erase(T&) |
44 | | - iterator find(T&) |
45 | | - const_iterator const_find "find"(T&) |
| 52 | + iterator const_erase "erase"(const_iterator) |
| 53 | + iterator erase(const_iterator, const_iterator) |
| 54 | + size_t erase(const T&) |
| 55 | + iterator find(const T&) |
| 56 | + const_iterator const_find "find"(const T&) |
46 | 57 | pair[iterator, bint] insert(const T&) except + |
47 | 58 | iterator insert(iterator, const T&) except + |
48 | | - void insert(iterator, iterator) except + |
| 59 | + iterator const_insert "insert"(const_iterator, const T&) except + |
| 60 | + void insert[InputIt](InputIt, InputIt) except + |
49 | 61 | #key_compare key_comp() |
50 | | - iterator lower_bound(T&) |
51 | | - const_iterator const_lower_bound "lower_bound"(T&) |
| 62 | + iterator lower_bound(const T&) |
| 63 | + const_iterator const_lower_bound "lower_bound"(const T&) |
52 | 64 | size_t max_size() |
53 | 65 | reverse_iterator rbegin() |
54 | 66 | const_reverse_iterator const_rbegin "rbegin"() |
@@ -65,20 +77,30 @@ cdef extern from "<set>" namespace "std" nogil: |
65 | 77 |
|
66 | 78 | cppclass iterator: |
67 | 79 | T& operator*() |
68 | | - iterator operator++() |
69 | | - iterator operator--() |
70 | | - bint operator==(iterator) |
71 | | - bint operator!=(iterator) |
| 80 | + iterator& operator++() |
| 81 | + iterator& operator--() |
| 82 | + bint operator==(const iterator&) |
| 83 | + bint operator!=(const iterator&) |
72 | 84 | cppclass reverse_iterator: |
73 | 85 | T& operator*() |
74 | | - iterator operator++() |
75 | | - iterator operator--() |
76 | | - bint operator==(reverse_iterator) |
77 | | - bint operator!=(reverse_iterator) |
78 | | - cppclass const_iterator(iterator): |
79 | | - pass |
80 | | - cppclass const_reverse_iterator(reverse_iterator): |
81 | | - pass |
| 86 | + reverse_iterator& operator++() |
| 87 | + reverse_iterator& operator--() |
| 88 | + bint operator==(const reverse_iterator&) |
| 89 | + bint operator!=(const reverse_iterator&) |
| 90 | + cppclass const_iterator: |
| 91 | + const_iterator(iterator) |
| 92 | + const T& operator*() |
| 93 | + const_iterator& operator++() |
| 94 | + const_iterator& operator--() |
| 95 | + bint operator==(const const_iterator&) |
| 96 | + bint operator!=(const const_iterator&) |
| 97 | + cppclass const_reverse_iterator: |
| 98 | + const_reverse_iterator(reverse_iterator) |
| 99 | + const T& operator*() |
| 100 | + const_reverse_iterator& operator++() |
| 101 | + const_reverse_iterator& operator--() |
| 102 | + bint operator==(const const_reverse_iterator&) |
| 103 | + bint operator!=(const const_reverse_iterator&) |
82 | 104 |
|
83 | 105 | multiset() except + |
84 | 106 | multiset(multiset&) except + |
@@ -98,18 +120,20 @@ cdef extern from "<set>" namespace "std" nogil: |
98 | 120 | iterator end() |
99 | 121 | const_iterator const_end "end"() |
100 | 122 | pair[iterator, iterator] equal_range(const T&) |
101 | | - #pair[const_iterator, const_iterator] equal_range(T&) |
| 123 | + pair[const_iterator, const_iterator] const_equal_range "equal_range"(const T&) |
102 | 124 | iterator erase(iterator) |
103 | | - iterator erase(iterator, iterator) |
104 | | - size_t erase(T&) |
105 | | - iterator find(T&) |
106 | | - const_iterator const_find "find"(T&) |
107 | | - pair[iterator, bint] insert(const T&) except + |
| 125 | + iterator const_erase "erase"(const_iterator) |
| 126 | + iterator erase(const_iterator, const_iterator) |
| 127 | + size_t erase(const T&) |
| 128 | + iterator find(const T&) |
| 129 | + const_iterator const_find "find"(const T&) |
| 130 | + iterator insert(const T&) except + |
108 | 131 | iterator insert(iterator, const T&) except + |
109 | | - void insert(iterator, iterator) except + |
| 132 | + iterator const_insert "insert"(const_iterator, const T&) except + |
| 133 | + void insert[InputIt](InputIt, InputIt) except + |
110 | 134 | #key_compare key_comp() |
111 | | - iterator lower_bound(T&) |
112 | | - const_iterator const_lower_bound "lower_bound"(T&) |
| 135 | + iterator lower_bound(const T&) |
| 136 | + const_iterator const_lower_bound "lower_bound"(const T&) |
113 | 137 | size_t max_size() |
114 | 138 | reverse_iterator rbegin() |
115 | 139 | const_reverse_iterator const_rbegin "rbegin"() |
|