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
100 lines
3.9 KiB
C++
100 lines
3.9 KiB
C++
--- extern/rapidfuzz-cpp/rapidfuzz/fuzz.hpp.orig 2023-09-26 11:15:29 UTC
|
|
+++ extern/rapidfuzz-cpp/rapidfuzz/fuzz.hpp
|
|
@@ -186,7 +186,7 @@ struct CachedPartialRatio { (private)
|
|
double similarity(const Sentence2& s2, double score_cutoff = 0.0, double score_hint = 0.0) const;
|
|
|
|
private:
|
|
- std::basic_string<CharT1> s1;
|
|
+ std::vector<CharT1> s1;
|
|
rapidfuzz::detail::CharSet<CharT1> s1_char_set;
|
|
CachedRatio<CharT1> cached_ratio;
|
|
};
|
|
@@ -296,7 +296,7 @@ struct CachedTokenSortRatio { (private)
|
|
double similarity(const Sentence2& s2, double score_cutoff = 0.0, double score_hint = 0.0) const;
|
|
|
|
private:
|
|
- std::basic_string<CharT1> s1_sorted;
|
|
+ std::vector<CharT1> s1_sorted;
|
|
CachedRatio<CharT1> cached_ratio;
|
|
};
|
|
|
|
@@ -354,7 +354,7 @@ struct CachedPartialTokenSortRatio { (private)
|
|
double similarity(const Sentence2& s2, double score_cutoff = 0.0, double score_hint = 0.0) const;
|
|
|
|
private:
|
|
- std::basic_string<CharT1> s1_sorted;
|
|
+ std::vector<CharT1> s1_sorted;
|
|
CachedPartialRatio<CharT1> cached_partial_ratio;
|
|
};
|
|
|
|
@@ -422,8 +422,8 @@ struct CachedTokenSetRatio { (private)
|
|
double similarity(const Sentence2& s2, double score_cutoff = 0.0, double score_hint = 0.0) const;
|
|
|
|
private:
|
|
- std::basic_string<CharT1> s1;
|
|
- detail::SplittedSentenceView<typename std::basic_string<CharT1>::iterator> tokens_s1;
|
|
+ std::vector<CharT1> s1;
|
|
+ detail::SplittedSentenceView<typename std::vector<CharT1>::iterator> tokens_s1;
|
|
};
|
|
|
|
template <typename Sentence1>
|
|
@@ -479,8 +479,8 @@ struct CachedPartialTokenSetRatio { (private)
|
|
double similarity(const Sentence2& s2, double score_cutoff = 0.0, double score_hint = 0.0) const;
|
|
|
|
private:
|
|
- std::basic_string<CharT1> s1;
|
|
- detail::SplittedSentenceView<typename std::basic_string<CharT1>::iterator> tokens_s1;
|
|
+ std::vector<CharT1> s1;
|
|
+ detail::SplittedSentenceView<typename std::vector<CharT1>::iterator> tokens_s1;
|
|
};
|
|
|
|
template <typename Sentence1>
|
|
@@ -539,9 +539,9 @@ struct CachedTokenRatio { (private)
|
|
double similarity(const Sentence2& s2, double score_cutoff = 0.0, double score_hint = 0.0) const;
|
|
|
|
private:
|
|
- std::basic_string<CharT1> s1;
|
|
- detail::SplittedSentenceView<typename std::basic_string<CharT1>::iterator> s1_tokens;
|
|
- std::basic_string<CharT1> s1_sorted;
|
|
+ std::vector<CharT1> s1;
|
|
+ detail::SplittedSentenceView<typename std::vector<CharT1>::iterator> s1_tokens;
|
|
+ std::vector<CharT1> s1_sorted;
|
|
CachedRatio<CharT1> cached_ratio_s1_sorted;
|
|
};
|
|
|
|
@@ -601,9 +601,9 @@ struct CachedPartialTokenRatio { (private)
|
|
double similarity(const Sentence2& s2, double score_cutoff = 0.0, double score_hint = 0.0) const;
|
|
|
|
private:
|
|
- std::basic_string<CharT1> s1;
|
|
- detail::SplittedSentenceView<typename std::basic_string<CharT1>::iterator> tokens_s1;
|
|
- std::basic_string<CharT1> s1_sorted;
|
|
+ std::vector<CharT1> s1;
|
|
+ detail::SplittedSentenceView<typename std::vector<CharT1>::iterator> tokens_s1;
|
|
+ std::vector<CharT1> s1_sorted;
|
|
};
|
|
|
|
template <typename Sentence1>
|
|
@@ -659,10 +659,10 @@ struct CachedWRatio { (private)
|
|
private:
|
|
// todo somehow implement this using other ratios with creating PatternMatchVector
|
|
// multiple times
|
|
- std::basic_string<CharT1> s1;
|
|
+ std::vector<CharT1> s1;
|
|
CachedPartialRatio<CharT1> cached_partial_ratio;
|
|
- detail::SplittedSentenceView<typename std::basic_string<CharT1>::iterator> tokens_s1;
|
|
- std::basic_string<CharT1> s1_sorted;
|
|
+ detail::SplittedSentenceView<typename std::vector<CharT1>::iterator> tokens_s1;
|
|
+ std::vector<CharT1> s1_sorted;
|
|
rapidfuzz::detail::BlockPatternMatchVector blockmap_s1_sorted;
|
|
};
|
|
|
|
@@ -774,7 +774,7 @@ struct CachedQRatio { (private)
|
|
double similarity(const Sentence2& s2, double score_cutoff = 0.0, double score_hint = 0.0) const;
|
|
|
|
private:
|
|
- std::basic_string<CharT1> s1;
|
|
+ std::vector<CharT1> s1;
|
|
CachedRatio<CharT1> cached_ratio;
|
|
};
|
|
|