mirror of
https://git.freebsd.org/ports.git
synced 2025-05-27 16:36:28 -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
36 lines
1.4 KiB
C++
36 lines
1.4 KiB
C++
--- extern/rapidfuzz-cpp/rapidfuzz/details/SplittedSentenceView.hpp.orig 2023-09-26 11:15:29 UTC
|
|
+++ extern/rapidfuzz-cpp/rapidfuzz/details/SplittedSentenceView.hpp
|
|
@@ -34,7 +34,7 @@ class SplittedSentenceView { (public)
|
|
return m_sentence.size();
|
|
}
|
|
|
|
- std::basic_string<CharT> join() const;
|
|
+ std::vector<CharT> join() const;
|
|
|
|
const RangeVec<InputIt>& words() const
|
|
{
|
|
@@ -68,19 +68,19 @@ template <typename InputIt>
|
|
}
|
|
|
|
template <typename InputIt>
|
|
-auto SplittedSentenceView<InputIt>::join() const -> std::basic_string<CharT>
|
|
+auto SplittedSentenceView<InputIt>::join() const -> std::vector<CharT>
|
|
{
|
|
if (m_sentence.empty()) {
|
|
- return std::basic_string<CharT>();
|
|
+ return std::vector<CharT>();
|
|
}
|
|
|
|
auto sentence_iter = m_sentence.begin();
|
|
- std::basic_string<CharT> joined(sentence_iter->begin(), sentence_iter->end());
|
|
- const std::basic_string<CharT> whitespace{0x20};
|
|
+ std::vector<CharT> joined(sentence_iter->begin(), sentence_iter->end());
|
|
+ const std::vector<CharT> whitespace{0x20};
|
|
++sentence_iter;
|
|
for (; sentence_iter != m_sentence.end(); ++sentence_iter) {
|
|
joined.append(whitespace)
|
|
- .append(std::basic_string<CharT>(sentence_iter->begin(), sentence_iter->end()));
|
|
+ .append(std::vector<CharT>(sentence_iter->begin(), sentence_iter->end()));
|
|
}
|
|
return joined;
|
|
}
|