--- 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 s1; + std::vector s1; rapidfuzz::detail::CharSet s1_char_set; CachedRatio 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 s1_sorted; + std::vector s1_sorted; CachedRatio 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 s1_sorted; + std::vector s1_sorted; CachedPartialRatio 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 s1; - detail::SplittedSentenceView::iterator> tokens_s1; + std::vector s1; + detail::SplittedSentenceView::iterator> tokens_s1; }; template @@ -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 s1; - detail::SplittedSentenceView::iterator> tokens_s1; + std::vector s1; + detail::SplittedSentenceView::iterator> tokens_s1; }; template @@ -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 s1; - detail::SplittedSentenceView::iterator> s1_tokens; - std::basic_string s1_sorted; + std::vector s1; + detail::SplittedSentenceView::iterator> s1_tokens; + std::vector s1_sorted; CachedRatio 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 s1; - detail::SplittedSentenceView::iterator> tokens_s1; - std::basic_string s1_sorted; + std::vector s1; + detail::SplittedSentenceView::iterator> tokens_s1; + std::vector s1_sorted; }; template @@ -659,10 +659,10 @@ struct CachedWRatio { (private) private: // todo somehow implement this using other ratios with creating PatternMatchVector // multiple times - std::basic_string s1; + std::vector s1; CachedPartialRatio cached_partial_ratio; - detail::SplittedSentenceView::iterator> tokens_s1; - std::basic_string s1_sorted; + detail::SplittedSentenceView::iterator> tokens_s1; + std::vector 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 s1; + std::vector s1; CachedRatio cached_ratio; };