mirror of
https://git.freebsd.org/ports.git
synced 2025-05-30 09:56:43 -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
69 lines
3.3 KiB
C++
69 lines
3.3 KiB
C++
--- src/Levenshtein/Levenshtein-c/_levenshtein.hpp.orig 2023-09-26 11:15:28 UTC
|
|
+++ src/Levenshtein/Levenshtein-c/_levenshtein.hpp
|
|
@@ -141,10 +141,10 @@ static inline std::vector<uint32_t> make_symlist(const
|
|
* Returns: The generalized median, as a newly allocated string; its length
|
|
* is stored in @medlength.
|
|
**/
|
|
-static inline std::basic_string<uint32_t> lev_greedy_median(const std::vector<RF_String>& strings,
|
|
- const std::vector<double>& weights)
|
|
+static inline std::vector<uint32_t> lev_greedy_median(const std::vector<RF_String>& strings,
|
|
+ const std::vector<double>& weights)
|
|
{
|
|
- std::basic_string<uint32_t> result_median;
|
|
+ std::vector<uint32_t> result_median;
|
|
|
|
/* find all symbols */
|
|
std::vector<uint32_t> symlist = make_symlist(strings);
|
|
@@ -335,13 +335,13 @@ static inline double finish_distance_computations(cons
|
|
*
|
|
* Returns: The improved generalized median
|
|
**/
|
|
-static inline std::basic_string<uint32_t> lev_median_improve(const RF_String& string,
|
|
- const std::vector<RF_String>& strings,
|
|
- const std::vector<double>& weights)
|
|
+static inline std::vector<uint32_t> lev_median_improve(const RF_String& string,
|
|
+ const std::vector<RF_String>& strings,
|
|
+ const std::vector<double>& weights)
|
|
{
|
|
/* find all symbols */
|
|
std::vector<uint32_t> symlist = make_symlist(strings);
|
|
- if (symlist.empty()) return std::basic_string<uint32_t>();
|
|
+ if (symlist.empty()) return std::vector<uint32_t>();
|
|
|
|
/* allocate and initialize per-string matrix rows and a common work buffer */
|
|
std::vector<std::unique_ptr<size_t[]>> rows(strings.size());
|
|
@@ -459,11 +459,11 @@ static inline std::basic_string<uint32_t> lev_median_i
|
|
}
|
|
}
|
|
|
|
- return std::basic_string<uint32_t>(median, medlen);
|
|
+ return std::vector<uint32_t>(median, median + medlen);
|
|
}
|
|
|
|
-std::basic_string<uint32_t> lev_quick_median(const std::vector<RF_String>& strings,
|
|
- const std::vector<double>& weights);
|
|
+std::vector<uint32_t> lev_quick_median(const std::vector<RF_String>& strings,
|
|
+ const std::vector<double>& weights);
|
|
|
|
/**
|
|
* lev_set_median:
|
|
@@ -477,8 +477,8 @@ std::basic_string<uint32_t> lev_quick_median(const std
|
|
*
|
|
* Returns: The set median
|
|
**/
|
|
-static inline std::basic_string<uint32_t> lev_set_median(const std::vector<RF_String>& strings,
|
|
- const std::vector<double>& weights)
|
|
+static inline std::vector<uint32_t> lev_set_median(const std::vector<RF_String>& strings,
|
|
+ const std::vector<double>& weights)
|
|
{
|
|
size_t minidx = 0;
|
|
double mindist = std::numeric_limits<double>::max();
|
|
@@ -521,7 +521,7 @@ static inline std::basic_string<uint32_t> lev_set_medi
|
|
}
|
|
|
|
return visit(strings[minidx], [&](auto s1) {
|
|
- return std::basic_string<uint32_t>(std::begin(s1), std::end(s1));
|
|
+ return std::vector<uint32_t>(std::begin(s1), std::end(s1));
|
|
});
|
|
}
|
|
|