some "except +" and const-correctness in libcpp (containers)

Cython/Includes/libcpp/map.pxd

@@ -33,27 +33,27 @@ cdef extern from "<map>" namespace "std" nogil:
         bint operator>(map&, map&)
         bint operator<=(map&, map&)
         bint operator>=(map&, map&)
-        U& at(T&)
+        U& at(const T&) except +
         iterator begin()
         const_iterator const_begin "begin" ()
         void clear()
-        size_t count(T&)
+        size_t count(const T&)
         bint empty()
         iterator end()
         const_iterator const_end "end" ()
-        pair[iterator, iterator] equal_range(T&)
+        pair[iterator, iterator] equal_range(const T&)
         #pair[const_iterator, const_iterator] equal_range(key_type&)
         void erase(iterator)
         void erase(iterator, iterator)
-        size_t erase(T&)
-        iterator find(T&)
-        const_iterator const_find "find" (T&)
-        pair[iterator, bint] insert(pair[T, U]) # XXX pair[T,U]&
-        iterator insert(iterator, pair[T, U]) # XXX pair[T,U]&
+        size_t erase(const T&)
+        iterator find(const T&)
+        const_iterator const_find "find" (const T&)
+        pair[iterator, bint] insert(pair[T, U]) except + # XXX pair[T,U]&
+        iterator insert(iterator, pair[T, U]) except + # XXX pair[T,U]&
         #void insert(input_iterator, input_iterator)
         #key_compare key_comp()
-        iterator lower_bound(T&)
-        #const_iterator lower_bound(key_type&)
+        iterator lower_bound(const T&)
+        #const_iterator lower_bound(const key_type&)
         size_t max_size()
         reverse_iterator rbegin()
         #const_reverse_iterator rbegin()
@@ -61,6 +61,6 @@ cdef extern from "<map>" namespace "std" nogil:
         #const_reverse_iterator rend()
         size_t size()
         void swap(map&)
-        iterator upper_bound(T&)
-        #const_iterator upper_bound(key_type&)
+        iterator upper_bound(const T&)
+        #const_iterator upper_bound(const key_type&)
         #value_compare value_comp()

Cython/Includes/libcpp/set.pxd

@@ -31,19 +31,19 @@ cdef extern from "<set>" namespace "std" nogil:
         iterator begin()
         #const_iterator begin()
         void clear()
-        size_t count(T&)
+        size_t count(const T&)
         bint empty()
         iterator end()
         #const_iterator end()
-        pair[iterator, iterator] equal_range(T&)
+        pair[iterator, iterator] equal_range(const T&)
         #pair[const_iterator, const_iterator] equal_range(T&)
         void erase(iterator)
         void erase(iterator, iterator)
         size_t erase(T&)
         iterator find(T&)
         #const_iterator find(T&)
-        pair[iterator, bint] insert(T&)
-        iterator insert(iterator, T&)
+        pair[iterator, bint] insert(const T&) except +
+        iterator insert(iterator, const T&) except +
         #void insert(input_iterator, input_iterator)
         #key_compare key_comp()
         iterator lower_bound(T&)
@@ -55,6 +55,6 @@ cdef extern from "<set>" namespace "std" nogil:
         #const_reverse_iterator rend()
         size_t size()
         void swap(set&)
-        iterator upper_bound(T&)
-        #const_iterator upper_bound(T&)
+        iterator upper_bound(const T&)
+        #const_iterator upper_bound(const T&)
         #value_compare value_comp()

Cython/Includes/libcpp/vector.pxd

@@ -41,9 +41,9 @@ cdef extern from "<vector>" namespace "std" nogil:
         bint operator>(vector&, vector&)
         bint operator<=(vector&, vector&)
         bint operator>=(vector&, vector&)
-        void assign(size_t, T&)
-        void assign[input_iterator](input_iterator, input_iterator)
-        T& at(size_t)
+        void assign(size_t, const T&)
+        void assign[input_iterator](input_iterator, input_iterator) except +
+        T& at(size_t) except +
         T& back()
         iterator begin()
         #const_iterator begin()
@@ -55,22 +55,22 @@ cdef extern from "<vector>" namespace "std" nogil:
         iterator erase(iterator)
         iterator erase(iterator, iterator)
         T& front()
-        iterator insert(iterator, T&)
-        void insert(iterator, size_t, T&)
-        void insert(iterator, iterator, iterator)
+        iterator insert(iterator, const T&) except +
+        void insert(iterator, size_t, const T&) except +
+        void insert[Iter](iterator, Iter, Iter) except +
         size_t max_size()
         void pop_back()
-        void push_back(T&)
+        void push_back(T&) except +
         reverse_iterator rbegin()
         #const_reverse_iterator rbegin()
         reverse_iterator rend()
         #const_reverse_iterator rend()
         void reserve(size_t)
-        void resize(size_t)
-        void resize(size_t, T&)
+        void resize(size_t) except +
+        void resize(size_t, T&) except +
         size_t size()
         void swap(vector&)
         
-        #C++0x methods
+        # C++11 methods
         T* data()
         void shrink_to_fit()