mirror of
https://git.freebsd.org/ports.git
synced 2025-04-29 01:56:37 -04:00
849cc48702
As noted in the libc++ 19 release notes [1], std::char_traits<> is now
only provided for char, char8_t, char16_t, char32_t and wchar_t, and any
instantiation for other types will fail.
This causes ports using devel/py-Levenshtein to fail to compile with
clang 19 and libc++ 19, resulting in errors similar to:
/usr/include/c++/v1/string:820:42: error: implicit instantiation of undefined template 'std::char_traits<unsigned int>'
820 | static_assert(is_same<_CharT, typename traits_type::char_type>::value,
| ^
/wrkdirs/usr/ports/devel/py-Levenshtein/work-py311/Levenshtein-0.22.0/src/Levenshtein/Levenshtein-c/_levenshtein.hpp:144:43: note: in instantiation of template class 'std::basic_string<unsigned int>' requested here
144 | static inline std::basic_string<uint32_t> lev_greedy_median(const std::vector<RF_String>& strings,
| ^
/usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared here
23 | struct _LIBCPP_TEMPLATE_VIS char_traits;
| ^
Unfortunately py-Levenshtein and its embedded copy of rapidfuzz-cpp make
heavy use of the no-longer-existing `std::basic_string<uint8_t>`, so I
had to do quite a lots of search and replace operations, replacing these
with equivalent `std::vector` types.
This is similar to the fixes for devel/rapidfuzz-cpp in bug 281193, and
for devel/py-rapidfuzz in bug 281194.
[1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals
PR: 281534
Approved by: maintainer timeout (2 weeks)
MFH: 2024Q3
74 lines
3.2 KiB
C++
74 lines
3.2 KiB
C++
--- src/Levenshtein/levenshtein_cpp.cxx.orig 2023-09-26 11:15:40 UTC
|
|
+++ src/Levenshtein/levenshtein_cpp.cxx
|
|
@@ -3094,7 +3094,7 @@ static PyObject *__pyx_pf_11Levenshtein_15levenshtein_
|
|
static PyObject *__pyx_pf_11Levenshtein_15levenshtein_cpp_median(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_strlist, PyObject *__pyx_v_wlist) {
|
|
std::vector<double> __pyx_v_weights;
|
|
std::vector<RF_String> __pyx_v_strings;
|
|
- std::basic_string<uint32_t> __pyx_v_median;
|
|
+ std::vector<uint32_t> __pyx_v_median;
|
|
PyObject *__pyx_r = NULL;
|
|
__Pyx_RefNannyDeclarations
|
|
int __pyx_t_1;
|
|
@@ -3104,7 +3104,7 @@ static PyObject *__pyx_pf_11Levenshtein_15levenshtein_
|
|
PyObject *__pyx_t_5 = NULL;
|
|
std::vector<double> __pyx_t_6;
|
|
std::vector<RF_String> __pyx_t_7;
|
|
- std::basic_string<uint32_t> __pyx_t_8;
|
|
+ std::vector<uint32_t> __pyx_t_8;
|
|
int __pyx_lineno = 0;
|
|
const char *__pyx_filename = NULL;
|
|
int __pyx_clineno = 0;
|
|
@@ -3345,7 +3345,7 @@ static PyObject *__pyx_pf_11Levenshtein_15levenshtein_
|
|
static PyObject *__pyx_pf_11Levenshtein_15levenshtein_cpp_2quickmedian(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_strlist, PyObject *__pyx_v_wlist) {
|
|
std::vector<double> __pyx_v_weights;
|
|
std::vector<RF_String> __pyx_v_strings;
|
|
- std::basic_string<uint32_t> __pyx_v_median;
|
|
+ std::vector<uint32_t> __pyx_v_median;
|
|
PyObject *__pyx_r = NULL;
|
|
__Pyx_RefNannyDeclarations
|
|
int __pyx_t_1;
|
|
@@ -3355,7 +3355,7 @@ static PyObject *__pyx_pf_11Levenshtein_15levenshtein_
|
|
PyObject *__pyx_t_5 = NULL;
|
|
std::vector<double> __pyx_t_6;
|
|
std::vector<RF_String> __pyx_t_7;
|
|
- std::basic_string<uint32_t> __pyx_t_8;
|
|
+ std::vector<uint32_t> __pyx_t_8;
|
|
int __pyx_lineno = 0;
|
|
const char *__pyx_filename = NULL;
|
|
int __pyx_clineno = 0;
|
|
@@ -3612,7 +3612,7 @@ static PyObject *__pyx_pf_11Levenshtein_15levenshtein_
|
|
std::vector<double> __pyx_v_weights;
|
|
RF_String __pyx_v_query;
|
|
std::vector<RF_String> __pyx_v_strings;
|
|
- std::basic_string<uint32_t> __pyx_v_median;
|
|
+ std::vector<uint32_t> __pyx_v_median;
|
|
PyObject *__pyx_r = NULL;
|
|
__Pyx_RefNannyDeclarations
|
|
int __pyx_t_1;
|
|
@@ -3623,7 +3623,7 @@ static PyObject *__pyx_pf_11Levenshtein_15levenshtein_
|
|
std::vector<double> __pyx_t_6;
|
|
RF_String __pyx_t_7;
|
|
std::vector<RF_String> __pyx_t_8;
|
|
- std::basic_string<uint32_t> __pyx_t_9;
|
|
+ std::vector<uint32_t> __pyx_t_9;
|
|
int __pyx_lineno = 0;
|
|
const char *__pyx_filename = NULL;
|
|
int __pyx_clineno = 0;
|
|
@@ -3874,7 +3874,7 @@ static PyObject *__pyx_pf_11Levenshtein_15levenshtein_
|
|
static PyObject *__pyx_pf_11Levenshtein_15levenshtein_cpp_6setmedian(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_strlist, PyObject *__pyx_v_wlist) {
|
|
std::vector<double> __pyx_v_weights;
|
|
std::vector<RF_String> __pyx_v_strings;
|
|
- std::basic_string<uint32_t> __pyx_v_median;
|
|
+ std::vector<uint32_t> __pyx_v_median;
|
|
PyObject *__pyx_r = NULL;
|
|
__Pyx_RefNannyDeclarations
|
|
int __pyx_t_1;
|
|
@@ -3884,7 +3884,7 @@ static PyObject *__pyx_pf_11Levenshtein_15levenshtein_
|
|
PyObject *__pyx_t_5 = NULL;
|
|
std::vector<double> __pyx_t_6;
|
|
std::vector<RF_String> __pyx_t_7;
|
|
- std::basic_string<uint32_t> __pyx_t_8;
|
|
+ std::vector<uint32_t> __pyx_t_8;
|
|
int __pyx_lineno = 0;
|
|
const char *__pyx_filename = NULL;
|
|
int __pyx_clineno = 0;
|