From 1b6a9e95a704ff947438ae8b829072c78a0f0fdc Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Thu, 27 Oct 2022 01:10:59 -0700 Subject: Return uint8_t from CappedDamerauLevenshteinDistance. PiperOrigin-RevId: 484181180 Change-Id: I00206c1506a25dca5555261d6500c1e54368a368 --- absl/strings/internal/damerau_levenshtein_distance.cc | 6 +++--- absl/strings/internal/damerau_levenshtein_distance.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'absl/strings') diff --git a/absl/strings/internal/damerau_levenshtein_distance.cc b/absl/strings/internal/damerau_levenshtein_distance.cc index 7cc23acd..a084568f 100644 --- a/absl/strings/internal/damerau_levenshtein_distance.cc +++ b/absl/strings/internal/damerau_levenshtein_distance.cc @@ -31,8 +31,8 @@ namespace strings_internal { // detected. // When the distance is larger than cutoff, or one of the strings has more // than MAX_SIZE=100 characters, the code returns min(MAX_SIZE, cutoff) + 1. -size_t CappedDamerauLevenshteinDistance(absl::string_view s1, - absl::string_view s2, uint8_t cutoff) { +uint8_t CappedDamerauLevenshteinDistance(absl::string_view s1, + absl::string_view s2, uint8_t cutoff) { const uint8_t MAX_SIZE = 100; const uint8_t _cutoff = std::min(MAX_SIZE, cutoff); const uint8_t cutoff_plus_1 = static_cast(_cutoff + 1); @@ -42,7 +42,7 @@ size_t CappedDamerauLevenshteinDistance(absl::string_view s1, return cutoff_plus_1; if (s1.empty()) - return std::min(static_cast(cutoff_plus_1), s2.size()); + return static_cast(s2.size()); // Lower diagonal bound: y = x - lower_diag const uint8_t lower_diag = diff --git a/absl/strings/internal/damerau_levenshtein_distance.h b/absl/strings/internal/damerau_levenshtein_distance.h index b9bb6fe1..1a968425 100644 --- a/absl/strings/internal/damerau_levenshtein_distance.h +++ b/absl/strings/internal/damerau_levenshtein_distance.h @@ -25,8 +25,8 @@ ABSL_NAMESPACE_BEGIN namespace strings_internal { // Calculate DamerauLevenshtein distance between two strings. // When the distance is larger than cutoff, the code just returns cutoff + 1. -size_t CappedDamerauLevenshteinDistance(absl::string_view s1, - absl::string_view s2, uint8_t cutoff); +uint8_t CappedDamerauLevenshteinDistance(absl::string_view s1, + absl::string_view s2, uint8_t cutoff); } // namespace strings_internal ABSL_NAMESPACE_END -- cgit v1.2.3