Add some overloaded C++ string methods that we missing (actually using optional arguments).

1 files changed, 30 insertions, 19 deletions

diff --git a/Cython/Includes/libcpp/string.pxd b/Cython/Includes/libcpp/string.pxd
index dc99703d6..f48d4b5f1 100644
--- a/Cython/Includes/libcpp/string.pxd
+++ b/Cython/Includes/libcpp/string.pxd
@@ -97,47 +97,58 @@ cdef extern from "<string>" namespace "std" nogil:
 
         size_t copy(char *, size_t, size_t) except +
 
+        size_t find(const string&, size_t pos)
         size_t find(const string&)
-        size_t find(const string&, size_t)
-        size_t find(const char*, size_t pos, size_t)
+        size_t find(const char*, size_t pos, size_t n)
         size_t find(const char*, size_t pos)
-        size_t find(char, size_t pos)
+        size_t find(const char*)
+        size_t find(char c, size_t pos)
+        size_t find(char c)
 
-        size_t rfind(const string&, size_t)
-        size_t rfind(const char* s, size_t, size_t)
+        size_t rfind(const string&, size_t pos)
+        size_t rfind(const string&)
+        size_t rfind(const char* s, size_t pos, size_t n)
         size_t rfind(const char*, size_t pos)
-        size_t rfind(char c, size_t)
+        size_t rfind(const char*)
+        size_t rfind(char c, size_t pos)
         size_t rfind(char c)
 
-        size_t find_first_of(const string&, size_t)
-        size_t find_first_of(const char* s, size_t, size_t)
+        size_t find_first_of(const string&, size_t pos)
+        size_t find_first_of(const string&)
+        size_t find_first_of(const char* s, size_t pos, size_t n)
         size_t find_first_of(const char*, size_t pos)
-        size_t find_first_of(char c, size_t)
+        size_t find_first_of(const char*)
+        size_t find_first_of(char c, size_t pos)
         size_t find_first_of(char c)
 
-        size_t find_first_not_of(const string&, size_t)
+        size_t find_first_not_of(const string&, size_t pos)
+        size_t find_first_not_of(const string&)
         size_t find_first_not_of(const char* s, size_t, size_t)
         size_t find_first_not_of(const char*, size_t pos)
-        size_t find_first_not_of(char c, size_t)
+        size_t find_first_not_of(const char*)
+        size_t find_first_not_of(char c, size_t pos)
         size_t find_first_not_of(char c)
 
-        size_t find_last_of(const string&, size_t)
-        size_t find_last_of(const char* s, size_t, size_t)
+        size_t find_last_of(const string&, size_t pos)
+        size_t find_last_of(const string&)
+        size_t find_last_of(const char* s, size_t pos, size_t n)
         size_t find_last_of(const char*, size_t pos)
-        size_t find_last_of(char c, size_t)
+        size_t find_last_of(const char*)
+        size_t find_last_of(char c, size_t pos)
         size_t find_last_of(char c)
 
-        size_t find_last_not_of(const string&, size_t)
-        size_t find_last_not_of(const char* s, size_t, size_t)
+        size_t find_last_not_of(const string&, size_t pos)
+        size_t find_last_not_of(const string&)
+        size_t find_last_not_of(const char* s, size_t pos, size_t n)
         size_t find_last_not_of(const char*, size_t pos)
+        size_t find_last_not_of(const char*)
+        size_t find_last_not_of(char c, size_t pos)
+        size_t find_last_not_of(char c)
 
         string substr(size_t, size_t) except +
         string substr()
         string substr(size_t) except +
 
-        size_t find_last_not_of(char c, size_t)
-        size_t find_last_not_of(char c)
-
         #string& operator= (const string&)
         #string& operator= (const char*)
         #string& operator= (char)