Fix const_iterator

- The declaration have to be the reverse of C++
  as the iterator class matches both iterator and const_iterator classes

Cython/Includes/libcpp/map.pxd

@@ -13,18 +13,14 @@ cdef extern from "<map>" namespace "std" nogil:
             iterator operator--()
             bint operator==(iterator)
             bint operator!=(iterator)
-        cppclass const_iterator:
-            pair[const T, U]& operator*()
-            const_iterator operator++()
-            const_iterator operator--()
-            bint operator==(const_iterator)
-            bint operator!=(const_iterator)
         cppclass reverse_iterator:
             pair[T, U]& operator*()
             iterator operator++()
             iterator operator--()
             bint operator==(reverse_iterator)
             bint operator!=(reverse_iterator)
+        cppclass const_iterator(iterator):
+            pass
         cppclass const_reverse_iterator(reverse_iterator):
             pass
         map() except +

Cython/Includes/libcpp/set.pxd

@@ -38,8 +38,8 @@ cdef extern from "<set>" namespace "std" nogil:
         const_iterator const_end "end"()
         pair[iterator, iterator] equal_range(const T&)
         #pair[const_iterator, const_iterator] equal_range(T&)
-        iterator erase(const_iterator)
-        iterator erase(const_iterator, const_iterator)
+        iterator erase(iterator)
+        iterator erase(iterator, iterator)
         size_t erase(T&)
         iterator find(T&)
         const_iterator const_find "find"(T&)