Skip to content

Commit 2db16b3

Browse files
committed
fix ambiguous call
1 parent 8411682 commit 2db16b3

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

extras/rapidfuzz_amalgamated.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Licensed under the MIT License <http://opensource.org/licenses/MIT>.
22
// SPDX-License-Identifier: MIT
33
// RapidFuzz v1.0.2
4-
// Generated: 2024-12-25 03:52:00.425895
4+
// Generated: 2024-12-25 03:55:48.239375
55
// ----------------------------------------------------------
66
// This file is an amalgamation of multiple different files.
77
// You probably shouldn't edit it directly.
@@ -1741,7 +1741,7 @@ DecomposedSet<InputIt1, InputIt2, InputIt1> set_decomposition(SplittedSentenceVi
17411741
}
17421742

17431743
template <class InputIt1, class InputIt2>
1744-
std::pair<InputIt1, InputIt2> mismatch(InputIt1 first1, InputIt1 last1, InputIt2 first2, InputIt2 last2)
1744+
std::pair<InputIt1, InputIt2> rf_mismatch(InputIt1 first1, InputIt1 last1, InputIt2 first2, InputIt2 last2)
17451745
{
17461746
while (first1 != last1 && first2 != last2 && *first1 == *first2)
17471747
++first1, ++first2;
@@ -1757,7 +1757,7 @@ size_t remove_common_prefix(Range<InputIt1>& s1, Range<InputIt2>& s2)
17571757
{
17581758
auto first1 = std::begin(s1);
17591759
size_t prefix = static_cast<size_t>(
1760-
std::distance(first1, mismatch(first1, std::end(s1), std::begin(s2), std::end(s2)).first));
1760+
std::distance(first1, rf_mismatch(first1, std::end(s1), std::begin(s2), std::end(s2)).first));
17611761
s1.remove_prefix(prefix);
17621762
s2.remove_prefix(prefix);
17631763
return prefix;
@@ -1771,7 +1771,7 @@ size_t remove_common_suffix(Range<InputIt1>& s1, Range<InputIt2>& s2)
17711771
{
17721772
auto rfirst1 = s1.rbegin();
17731773
size_t suffix = static_cast<size_t>(
1774-
std::distance(rfirst1, mismatch(rfirst1, s1.rend(), s2.rbegin(), s2.rend()).first));
1774+
std::distance(rfirst1, rf_mismatch(rfirst1, s1.rend(), s2.rbegin(), s2.rend()).first));
17751775
s1.remove_suffix(suffix);
17761776
s2.remove_suffix(suffix);
17771777
return suffix;

rapidfuzz/details/common_impl.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ DecomposedSet<InputIt1, InputIt2, InputIt1> set_decomposition(SplittedSentenceVi
3535
}
3636

3737
template <class InputIt1, class InputIt2>
38-
std::pair<InputIt1, InputIt2> mismatch(InputIt1 first1, InputIt1 last1, InputIt2 first2, InputIt2 last2)
38+
std::pair<InputIt1, InputIt2> rf_mismatch(InputIt1 first1, InputIt1 last1, InputIt2 first2, InputIt2 last2)
3939
{
4040
while (first1 != last1 && first2 != last2 && *first1 == *first2)
4141
++first1, ++first2;
@@ -51,7 +51,7 @@ size_t remove_common_prefix(Range<InputIt1>& s1, Range<InputIt2>& s2)
5151
{
5252
auto first1 = std::begin(s1);
5353
size_t prefix = static_cast<size_t>(
54-
std::distance(first1, mismatch(first1, std::end(s1), std::begin(s2), std::end(s2)).first));
54+
std::distance(first1, rf_mismatch(first1, std::end(s1), std::begin(s2), std::end(s2)).first));
5555
s1.remove_prefix(prefix);
5656
s2.remove_prefix(prefix);
5757
return prefix;
@@ -65,7 +65,7 @@ size_t remove_common_suffix(Range<InputIt1>& s1, Range<InputIt2>& s2)
6565
{
6666
auto rfirst1 = s1.rbegin();
6767
size_t suffix = static_cast<size_t>(
68-
std::distance(rfirst1, mismatch(rfirst1, s1.rend(), s2.rbegin(), s2.rend()).first));
68+
std::distance(rfirst1, rf_mismatch(rfirst1, s1.rend(), s2.rbegin(), s2.rend()).first));
6969
s1.remove_suffix(suffix);
7070
s2.remove_suffix(suffix);
7171
return suffix;

0 commit comments

Comments
 (0)