Restoring authorship annotation for <shadchin@yandex-team.ru>. Commit 2 of 2.

3 files changed, 162 insertions, 162 deletions

diff --git a/contrib/tools/cython/Cython/Includes/libcpp/string.pxd b/contrib/tools/cython/Cython/Includes/libcpp/string.pxd
index 14fe5ede4b..a894144f1f 100644
--- a/contrib/tools/cython/Cython/Includes/libcpp/string.pxd
+++ b/contrib/tools/cython/Cython/Includes/libcpp/string.pxd
@@ -2,8 +2,8 @@
 # deprecated cimport for backwards compatibility:
 from libc.string cimport const_char
 
-cdef extern from "<string>" namespace "std::string" nogil: 
-    const size_t npos 
+cdef extern from "<string>" namespace "std::string" nogil:
+    const size_t npos
 
 cdef extern from "<string>" namespace "std" nogil:
     cdef cppclass string:
@@ -11,12 +11,12 @@ cdef extern from "<string>" namespace "std" nogil:
         cppclass iterator:
             iterator()
             char& operator*()
-            iterator(iterator&) 
+            iterator(iterator&)
             iterator operator++()
             iterator operator--()
             bint operator==(iterator)
             bint operator!=(iterator)
- 
+
         cppclass reverse_iterator:
             char& operator*()
             iterator operator++()
@@ -29,22 +29,22 @@ cdef extern from "<string>" namespace "std" nogil:
             bint operator>(reverse_iterator)
             bint operator<=(reverse_iterator)
             bint operator>=(reverse_iterator)
- 
+
         cppclass const_iterator(iterator):
             pass
- 
+
         cppclass const_reverse_iterator(reverse_iterator):
             pass
 
-        string() except + 
-        string(const string& s) except + 
-        string(const string& s, size_t pos) except + 
-        string(const string& s, size_t pos, size_t len) except + 
-        string(const char* s) except + 
-        string(const char* s, size_t n) except + 
-        string(size_t n, char c) except + 
-        string(iterator first, iterator last) except + 
- 
+        string() except +
+        string(const string& s) except +
+        string(const string& s, size_t pos) except +
+        string(const string& s, size_t pos, size_t len) except +
+        string(const char* s) except +
+        string(const char* s, size_t n) except +
+        string(size_t n, char c) except +
+        string(iterator first, iterator last) except +
+
         iterator begin()
         const_iterator const_begin "begin"()
         iterator end()
@@ -59,123 +59,123 @@ cdef extern from "<string>" namespace "std" nogil:
         size_t size()
         size_t max_size()
         size_t length()
-        void resize(size_t) except + 
-        void resize(size_t, char) except + 
-        void shrink_to_fit() except + 
+        void resize(size_t) except +
+        void resize(size_t, char) except +
+        void shrink_to_fit() except +
         size_t capacity()
-        void reserve(size_t) except + 
+        void reserve(size_t) except +
         void clear()
         bint empty()
 
-        iterator erase(iterator first, iterator last) 
-        iterator erase(iterator p) 
-        iterator erase(const_iterator first, const_iterator last) 
-        iterator erase(const_iterator p) 
-        string& erase(size_t pos, size_t len) except + 
-        string& erase(size_t pos) except + 
-        string& erase() except + 
-
-        char& at(size_t pos) except + 
-        char& operator[](size_t pos) 
-        char& front() 
-        char& back() 
-        int compare(const string& s) 
-        int compare(size_t pos, size_t len, const string& s) except + 
-        int compare(size_t pos, size_t len, const string& s, size_t subpos, size_t sublen) except + 
-        int compare(const char* s) except + 
-        int compare(size_t pos, size_t len, const char* s) except + 
-        int compare(size_t pos, size_t len, const char* s , size_t n) except + 
-
-        string& append(const string& s) except + 
-        string& append(const string& s, size_t subpos, size_t sublen) except + 
-        string& append(const char* s) except + 
-        string& append(const char* s, size_t n) except + 
-        string& append(size_t n, char c) except + 
-
-        void push_back(char c) except + 
-        void pop_back() 
-
-        string& assign(const string& s) except + 
-        string& assign(const string& s, size_t subpos, size_t sublen) except + 
-        string& assign(const char* s, size_t n) except + 
-        string& assign(const char* s) except + 
-        string& assign(size_t n, char c) except + 
-
-        string& insert(size_t pos, const string& s, size_t subpos, size_t sublen) except + 
-        string& insert(size_t pos, const string& s) except + 
-        string& insert(size_t pos, const char* s, size_t n) except + 
-        string& insert(size_t pos, const char* s) except + 
-        string& insert(size_t pos, size_t n, char c) except + 
-        void insert(iterator p, size_t n, char c) except + 
-        iterator insert(iterator p, char c) except + 
-
-        size_t copy(char* s, size_t len, size_t pos) except + 
-        size_t copy(char* s, size_t len) except + 
-
-        size_t find(const string& s, size_t pos) 
-        size_t find(const string& s) 
-        size_t find(const char* s, size_t pos, size_t n) 
-        size_t find(const char* s, size_t pos) 
-        size_t find(const char* s) 
-        size_t find(char c, size_t pos) 
-        size_t find(char c) 
-
-        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* s, size_t pos) 
-        size_t rfind(const char* s) 
-        size_t rfind(char c, size_t pos) 
+        iterator erase(iterator first, iterator last)
+        iterator erase(iterator p)
+        iterator erase(const_iterator first, const_iterator last)
+        iterator erase(const_iterator p)
+        string& erase(size_t pos, size_t len) except +
+        string& erase(size_t pos) except +
+        string& erase() except +
+
+        char& at(size_t pos) except +
+        char& operator[](size_t pos)
+        char& front()
+        char& back()
+        int compare(const string& s)
+        int compare(size_t pos, size_t len, const string& s) except +
+        int compare(size_t pos, size_t len, const string& s, size_t subpos, size_t sublen) except +
+        int compare(const char* s) except +
+        int compare(size_t pos, size_t len, const char* s) except +
+        int compare(size_t pos, size_t len, const char* s , size_t n) except +
+
+        string& append(const string& s) except +
+        string& append(const string& s, size_t subpos, size_t sublen) except +
+        string& append(const char* s) except +
+        string& append(const char* s, size_t n) except +
+        string& append(size_t n, char c) except +
+
+        void push_back(char c) except +
+        void pop_back()
+
+        string& assign(const string& s) except +
+        string& assign(const string& s, size_t subpos, size_t sublen) except +
+        string& assign(const char* s, size_t n) except +
+        string& assign(const char* s) except +
+        string& assign(size_t n, char c) except +
+
+        string& insert(size_t pos, const string& s, size_t subpos, size_t sublen) except +
+        string& insert(size_t pos, const string& s) except +
+        string& insert(size_t pos, const char* s, size_t n) except +
+        string& insert(size_t pos, const char* s) except +
+        string& insert(size_t pos, size_t n, char c) except +
+        void insert(iterator p, size_t n, char c) except +
+        iterator insert(iterator p, char c) except +
+
+        size_t copy(char* s, size_t len, size_t pos) except +
+        size_t copy(char* s, size_t len) except +
+
+        size_t find(const string& s, size_t pos)
+        size_t find(const string& s)
+        size_t find(const char* s, size_t pos, size_t n)
+        size_t find(const char* s, size_t pos)
+        size_t find(const char* s)
+        size_t find(char c, size_t pos)
+        size_t find(char c)
+
+        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* s, size_t pos)
+        size_t rfind(const char* s)
+        size_t rfind(char c, size_t pos)
         size_t rfind(char c)
 
-        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* s, size_t pos) 
-        size_t find_first_of(const char* s) 
-        size_t find_first_of(char c, size_t pos) 
+        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* s, size_t pos)
+        size_t find_first_of(const char* s)
+        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& s, size_t pos) 
-        size_t find_first_not_of(const string& s) 
-        size_t find_first_not_of(const char* s, size_t pos, size_t n) 
-        size_t find_first_not_of(const char* s, size_t pos) 
-        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(const string& s, size_t pos)
+        size_t find_first_not_of(const string& s)
+        size_t find_first_not_of(const char* s, size_t pos, size_t n)
+        size_t find_first_not_of(const char* s, size_t pos)
+        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& s, size_t pos) 
-        size_t find_last_of(const string& s) 
-        size_t find_last_of(const char* s, size_t pos, size_t n) 
-        size_t find_last_of(const char* s, size_t pos) 
-        size_t find_last_of(const char* s) 
-        size_t find_last_of(char c, size_t pos) 
+        size_t find_last_of(const string& s, size_t pos)
+        size_t find_last_of(const string& s)
+        size_t find_last_of(const char* s, size_t pos, size_t n)
+        size_t find_last_of(const char* s, size_t pos)
+        size_t find_last_of(const char* s)
+        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& s, size_t pos) 
-        size_t find_last_not_of(const string& s) 
-        size_t find_last_not_of(const char* s, size_t pos, size_t n) 
-        size_t find_last_not_of(const char* s, size_t pos) 
-        size_t find_last_not_of(const char* s) 
-        size_t find_last_not_of(char c, size_t pos) 
-        size_t find_last_not_of(char c) 
+        size_t find_last_not_of(const string& s, size_t pos)
+        size_t find_last_not_of(const string& s)
+        size_t find_last_not_of(const char* s, size_t pos, size_t n)
+        size_t find_last_not_of(const char* s, size_t pos)
+        size_t find_last_not_of(const char* s)
+        size_t find_last_not_of(char c, size_t pos)
+        size_t find_last_not_of(char c)
 
-        string substr(size_t pos, size_t len) except + 
-        string substr(size_t pos) except + 
+        string substr(size_t pos, size_t len) except +
+        string substr(size_t pos) except +
         string substr()
 
         #string& operator= (const string&)
         #string& operator= (const char*)
         #string& operator= (char)
 
-        string operator+ (const string&) except + 
-        string operator+ (const char*) except + 
+        string operator+ (const string&) except +
+        string operator+ (const char*) except +
 
         bint operator==(const string&)
         bint operator==(const char*)
 
-        bint operator!= (const string&) 
-        bint operator!= (const char*) 
+        bint operator!= (const string&)
+        bint operator!= (const char*)
 
         bint operator< (const string&)
         bint operator< (const char*)
@@ -188,40 +188,40 @@ cdef extern from "<string>" namespace "std" nogil:
 
         bint operator>= (const string&)
         bint operator>= (const char*)
- 
- 
-    string to_string(int val) except + 
-    string to_string(long val) except + 
-    string to_string(long long val) except + 
-    string to_string(unsigned val) except + 
-    string to_string(size_t val) except + 
-    string to_string(ssize_t val) except + 
-    string to_string(unsigned long val) except + 
-    string to_string(unsigned long long val) except + 
-    string to_string(float val) except + 
-    string to_string(double val) except + 
-    string to_string(long double val) except + 
- 
-    int stoi(const string& s, size_t* idx, int base) except + 
-    int stoi(const string& s, size_t* idx) except + 
-    int stoi(const string& s) except + 
-    long stol(const string& s, size_t* idx, int base) except + 
-    long stol(const string& s, size_t* idx) except + 
-    long stol(const string& s) except + 
-    long long stoll(const string& s, size_t* idx, int base) except + 
-    long long stoll(const string& s, size_t* idx) except + 
-    long long stoll(const string& s) except + 
- 
-    unsigned long stoul(const string& s, size_t* idx, int base) except + 
-    unsigned long stoul(const string& s, size_t* idx) except + 
-    unsigned long stoul(const string& s) except + 
-    unsigned long long stoull(const string& s, size_t* idx, int base) except + 
-    unsigned long long stoull(const string& s, size_t* idx) except + 
-    unsigned long long stoull(const string& s) except + 
- 
-    float stof(const string& s, size_t* idx) except + 
-    float stof(const string& s) except + 
-    double stod(const string& s, size_t* idx) except + 
-    double stod(const string& s) except + 
-    long double stold(const string& s, size_t* idx) except + 
-    long double stold(const string& s) except + 
+
+
+    string to_string(int val) except +
+    string to_string(long val) except +
+    string to_string(long long val) except +
+    string to_string(unsigned val) except +
+    string to_string(size_t val) except +
+    string to_string(ssize_t val) except +
+    string to_string(unsigned long val) except +
+    string to_string(unsigned long long val) except +
+    string to_string(float val) except +
+    string to_string(double val) except +
+    string to_string(long double val) except +
+
+    int stoi(const string& s, size_t* idx, int base) except +
+    int stoi(const string& s, size_t* idx) except +
+    int stoi(const string& s) except +
+    long stol(const string& s, size_t* idx, int base) except +
+    long stol(const string& s, size_t* idx) except +
+    long stol(const string& s) except +
+    long long stoll(const string& s, size_t* idx, int base) except +
+    long long stoll(const string& s, size_t* idx) except +
+    long long stoll(const string& s) except +
+
+    unsigned long stoul(const string& s, size_t* idx, int base) except +
+    unsigned long stoul(const string& s, size_t* idx) except +
+    unsigned long stoul(const string& s) except +
+    unsigned long long stoull(const string& s, size_t* idx, int base) except +
+    unsigned long long stoull(const string& s, size_t* idx) except +
+    unsigned long long stoull(const string& s) except +
+
+    float stof(const string& s, size_t* idx) except +
+    float stof(const string& s) except +
+    double stod(const string& s, size_t* idx) except +
+    double stod(const string& s) except +
+    long double stold(const string& s, size_t* idx) except +
+    long double stold(const string& s) except +
diff --git a/contrib/tools/cython/Cython/Includes/libcpp/unordered_map.pxd b/contrib/tools/cython/Cython/Includes/libcpp/unordered_map.pxd
index 6b1e3793e7..a00fbbed28 100644
--- a/contrib/tools/cython/Cython/Includes/libcpp/unordered_map.pxd
+++ b/contrib/tools/cython/Cython/Includes/libcpp/unordered_map.pxd
@@ -1,7 +1,7 @@
 from .utility cimport pair
 
 cdef extern from "<unordered_map>" namespace "std" nogil:
-    cdef cppclass unordered_map[T, U, HASH=*, PRED=*, ALLOCATOR=*]: 
+    cdef cppclass unordered_map[T, U, HASH=*, PRED=*, ALLOCATOR=*]:
         ctypedef T key_type
         ctypedef U mapped_type
         ctypedef pair[const T, U] value_type
diff --git a/contrib/tools/cython/Cython/Includes/libcpp/utility.pxd b/contrib/tools/cython/Cython/Includes/libcpp/utility.pxd
index 3dc02e9380..e0df69b166 100644
--- a/contrib/tools/cython/Cython/Includes/libcpp/utility.pxd
+++ b/contrib/tools/cython/Cython/Includes/libcpp/utility.pxd
@@ -13,18 +13,18 @@ cdef extern from "<utility>" namespace "std" nogil:
         bint operator>(pair&, pair&)
         bint operator<=(pair&, pair&)
         bint operator>=(pair&, pair&)
- 
-cdef extern from * namespace "cython_std" nogil: 
-    """ 
-    #if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1600) 
-    // move should be defined for these versions of MSVC, but __cplusplus isn't set usefully 
-    #include <type_traits> 
- 
-    namespace cython_std { 
-    template <typename T> typename std::remove_reference<T>::type&& move(T& t) noexcept { return std::move(t); } 
-    template <typename T> typename std::remove_reference<T>::type&& move(T&& t) noexcept { return std::move(t); } 
-    } 
- 
-    #endif 
-    """ 
-    cdef T move[T](T) 
+
+cdef extern from * namespace "cython_std" nogil:
+    """
+    #if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1600)
+    // move should be defined for these versions of MSVC, but __cplusplus isn't set usefully
+    #include <type_traits>
+
+    namespace cython_std {
+    template <typename T> typename std::remove_reference<T>::type&& move(T& t) noexcept { return std::move(t); }
+    template <typename T> typename std::remove_reference<T>::type&& move(T&& t) noexcept { return std::move(t); }
+    }
+
+    #endif
+    """
+    cdef T move[T](T)