forked from Lainports/freebsd-ports
9830c5e79d
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/rapidfuzz-cpp 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-rapidfuzz/work-py311/rapidfuzz-3.9.6/src/rapidfuzz/cpp_common.hpp:711:25: note: in instantiation of template class 'std::basic_string<unsigned int>' requested here
711 | auto proc_str = rf::opcodes_apply<uint32_t>(ops, s1, s2);
| ^
The devel/rapidfuzz-cpp port itself does "build" since it only gathers a
bunch of headers and installs them into the stage area, but running
'make test' also fails similarly:
/usr/include/c++/v1/string:820:42: error: implicit instantiation of undefined template 'std::char_traits<unsigned char>'
820 | static_assert(is_same<_CharT, typename traits_type::char_type>::value,
| ^
/wrkdirs/usr/ports/devel/rapidfuzz-cpp/work/rapidfuzz-cpp-3.0.5/test/distance/examples/ocr.cpp:3:28: note: in instantiation of template class 'std::basic_string<unsigned char>' requested here
3 | std::basic_string<uint8_t> ocr_example1 = {
| ^
/usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared here
23 | struct _LIBCPP_TEMPLATE_VIS char_traits;
| ^
Unfortunately rapidfuzz-cpp makes 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.
Note that as far as I can see, only devel/py-rapidfuzz is a consumer of
this port, applying these changes should not disrupt anything else. I
have a follow-up patch for that port too.
[1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals
PR: 281193
Approved by: yuri (maintainer)
MFH: 2024Q3
53 lines
2.5 KiB
C++
53 lines
2.5 KiB
C++
--- extras/rapidfuzz_amalgamated.hpp.orig 2024-07-02 14:50:14 UTC
|
|
+++ extras/rapidfuzz_amalgamated.hpp
|
|
@@ -9152,13 +9152,13 @@ template <typename CharT, typename InputIt1, typename
|
|
namespace rapidfuzz {
|
|
|
|
template <typename CharT, typename InputIt1, typename InputIt2>
|
|
-std::basic_string<CharT> editops_apply(const Editops& ops, InputIt1 first1, InputIt1 last1, InputIt2 first2,
|
|
- InputIt2 last2)
|
|
+std::vector<CharT> editops_apply(const Editops& ops, InputIt1 first1, InputIt1 last1, InputIt2 first2,
|
|
+ InputIt2 last2)
|
|
{
|
|
auto len1 = static_cast<size_t>(std::distance(first1, last1));
|
|
auto len2 = static_cast<size_t>(std::distance(first2, last2));
|
|
|
|
- std::basic_string<CharT> res_str;
|
|
+ std::vector<CharT> res_str;
|
|
res_str.resize(len1 + len2);
|
|
size_t src_pos = 0;
|
|
size_t dest_pos = 0;
|
|
@@ -9198,20 +9198,20 @@ template <typename CharT, typename Sentence1, typename
|
|
}
|
|
|
|
template <typename CharT, typename Sentence1, typename Sentence2>
|
|
-std::basic_string<CharT> editops_apply(const Editops& ops, const Sentence1& s1, const Sentence2& s2)
|
|
+std::vector<CharT> editops_apply(const Editops& ops, const Sentence1& s1, const Sentence2& s2)
|
|
{
|
|
return editops_apply<CharT>(ops, detail::to_begin(s1), detail::to_end(s1), detail::to_begin(s2),
|
|
detail::to_end(s2));
|
|
}
|
|
|
|
template <typename CharT, typename InputIt1, typename InputIt2>
|
|
-std::basic_string<CharT> opcodes_apply(const Opcodes& ops, InputIt1 first1, InputIt1 last1, InputIt2 first2,
|
|
- InputIt2 last2)
|
|
+std::vector<CharT> opcodes_apply(const Opcodes& ops, InputIt1 first1, InputIt1 last1, InputIt2 first2,
|
|
+ InputIt2 last2)
|
|
{
|
|
auto len1 = static_cast<size_t>(std::distance(first1, last1));
|
|
auto len2 = static_cast<size_t>(std::distance(first2, last2));
|
|
|
|
- std::basic_string<CharT> res_str;
|
|
+ std::vector<CharT> res_str;
|
|
res_str.resize(len1 + len2);
|
|
size_t dest_pos = 0;
|
|
|
|
@@ -9237,7 +9237,7 @@ template <typename CharT, typename Sentence1, typename
|
|
}
|
|
|
|
template <typename CharT, typename Sentence1, typename Sentence2>
|
|
-std::basic_string<CharT> opcodes_apply(const Opcodes& ops, const Sentence1& s1, const Sentence2& s2)
|
|
+std::vector<CharT> opcodes_apply(const Opcodes& ops, const Sentence1& s1, const Sentence2& s2)
|
|
{
|
|
return opcodes_apply<CharT>(ops, detail::to_begin(s1), detail::to_end(s1), detail::to_begin(s2),
|
|
detail::to_end(s2));
|