Merge branch 'PR'

5 files changed, 5 insertions, 21 deletions

diff --git a/util/generic/fwd.h b/util/generic/fwd.h
index 906203d60e..d1acc25256 100644
--- a/util/generic/fwd.h
+++ b/util/generic/fwd.h
@@ -8,6 +8,9 @@ template <typename TCharType, typename TTraits = std::char_traits<TCharType>>
 class TBasicString;
 
 using TString = TBasicString<char>;
+#ifndef TSTRING_IS_STD_STRING
+using TCowString = TBasicString<char>;
+#endif
 using TUtf16String = TBasicString<wchar16>;
 using TUtf32String = TBasicString<wchar32>;
 
diff --git a/util/generic/hash.pxd b/util/generic/hash.pxd
index 385c10d805..027e87d968 100644
--- a/util/generic/hash.pxd
+++ b/util/generic/hash.pxd
@@ -5,7 +5,6 @@ cdef extern from "util/generic/hash.h" nogil:
         cppclass iterator:
             pair[T, U]& operator*()
             iterator operator++()
-            iterator operator--()
             bint operator==(iterator)
             bint operator!=(iterator)
 
@@ -15,7 +14,6 @@ cdef extern from "util/generic/hash.h" nogil:
         cppclass reverse_iterator:
             pair[T, U]& operator*()
             iterator operator++()
-            iterator operator--()
             bint operator==(reverse_iterator)
             bint operator!=(reverse_iterator)
 
@@ -29,10 +27,6 @@ cdef extern from "util/generic/hash.h" nogil:
 
         bint operator==(THashMap&)
         bint operator!=(THashMap&)
-        bint operator<(THashMap&)
-        bint operator>(THashMap&)
-        bint operator<=(THashMap&)
-        bint operator>=(THashMap&)
 
         U& at(T&) except +
         iterator begin()
@@ -54,13 +48,7 @@ cdef extern from "util/generic/hash.h" nogil:
         size_t max_size()
         size_t size()
         void swap(THashMap&)
-        iterator lower_bound(T&)
-        const_iterator const_lower_bound "lower_bound"(T&)
         reverse_iterator rbegin()
         const_reverse_iterator const_rbegin "rbegin"()
         reverse_iterator rend()
         const_reverse_iterator const_rend "rend"()
-        iterator upper_bound(T&)
-        const_iterator const_upper_bound "upper_bound"(T&)
-        void max_load_factor(float)
-        float max_load_factor()
diff --git a/util/generic/hash_set.pxd b/util/generic/hash_set.pxd
index d28d90cbe7..37da2a9da4 100644
--- a/util/generic/hash_set.pxd
+++ b/util/generic/hash_set.pxd
@@ -5,7 +5,6 @@ cdef extern from "util/generic/hash_set.h" nogil:
         cppclass iterator:
             T& operator*()
             iterator operator++()
-            iterator operator--()
             bint operator==(iterator)
             bint operator!=(iterator)
 
@@ -14,15 +13,10 @@ cdef extern from "util/generic/hash_set.h" nogil:
 
         THashSet() except +
         THashSet(THashSet&) except +
-        THashSet(T* t) except +
         THashSet& operator=(THashSet&)
 
         bint operator==(THashSet&)
         bint operator!=(THashSet&)
-        bint operator<(THashSet&)
-        bint operator>(THashSet&)
-        bint operator<=(THashSet&)
-        bint operator>=(THashSet&)
 
         iterator begin()
         const_iterator const_begin "begin"()
diff --git a/util/generic/ptr.pxd b/util/generic/ptr.pxd
index 16e8d19144..e407829519 100644
--- a/util/generic/ptr.pxd
+++ b/util/generic/ptr.pxd
@@ -36,7 +36,8 @@ cdef extern from "<util/generic/ptr.h>" nogil:
         TAtomicSharedPtr(T*)
         T& operator*()
         T* Get()
-        void Reset(T*)
+        void Reset(T*)  # this is a fake signature as a workaround for Cython's inability to support implicit conversion T* -> TAtomicSharedPtr[T]
+        void Reset(TAtomicSharedPtr) noexcept
 
 
     cdef TAtomicSharedPtr[T] MakeAtomicShared[T](...)
diff --git a/util/generic/string.pxd b/util/generic/string.pxd
index c25f7392a1..d9d5e014e1 100644
--- a/util/generic/string.pxd
+++ b/util/generic/string.pxd
@@ -29,8 +29,6 @@ cdef extern from "<util/generic/string.h>" nogil:
         TString(size_t, char) except +
         TString(char*, char*) except +
         TString(TStringBuf&) except +
-        TString(TStringBuf&, TStringBuf&) except +
-        TString(TStringBuf&, TStringBuf&, TStringBuf&) except +
 
         const char* c_str()
         size_t max_size()