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
45 lines
1.5 KiB
C++
45 lines
1.5 KiB
C++
--- fuzzing/fuzzing.hpp.orig 2024-07-02 14:50:14 UTC
|
|
+++ fuzzing/fuzzing.hpp
|
|
@@ -3,8 +3,8 @@
|
|
#include <rapidfuzz/distance/Levenshtein.hpp>
|
|
#include <string>
|
|
|
|
-static inline bool extract_strings(const uint8_t* data, size_t size, std::basic_string<uint8_t>& s1,
|
|
- std::basic_string<uint8_t>& s2)
|
|
+static inline bool extract_strings(const uint8_t* data, size_t size, std::vector<uint8_t>& s1,
|
|
+ std::vector<uint8_t>& s2)
|
|
{
|
|
if (size <= sizeof(uint32_t)) {
|
|
return false;
|
|
@@ -17,8 +17,8 @@ static inline bool extract_strings(const uint8_t* data
|
|
|
|
data += sizeof(len1);
|
|
size -= sizeof(len1);
|
|
- s1 = std::basic_string<uint8_t>(data, len1);
|
|
- s2 = std::basic_string<uint8_t>(data + len1, size - len1);
|
|
+ s1 = std::vector<uint8_t>(data, len1);
|
|
+ s2 = std::vector<uint8_t>(data + len1, size - len1);
|
|
return true;
|
|
}
|
|
|
|
@@ -36,9 +36,9 @@ template <typename T>
|
|
}
|
|
|
|
template <typename T>
|
|
-std::basic_string<T> str_multiply(std::basic_string<T> a, size_t b)
|
|
+std::vector<T> str_multiply(std::vector<T> a, size_t b)
|
|
{
|
|
- std::basic_string<T> output;
|
|
+ std::vector<T> output;
|
|
while (b--)
|
|
output += a;
|
|
|
|
@@ -46,7 +46,7 @@ template <typename T>
|
|
}
|
|
|
|
template <typename T>
|
|
-void print_seq(const std::string& name, const std::basic_string<T>& seq)
|
|
+void print_seq(const std::string& name, const std::vector<T>& seq)
|
|
{
|
|
std::cout << name << " len: " << seq.size() << " content: ";
|
|
for (const auto& ch : seq)
|