From 1d03835c5dd00dbc855f3afbbad7b21ee2919929 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 24 Jan 2023 16:55:41 -0500 Subject: [PATCH] StringUtil: Make StringUTF8CodePointCount take string_view There's nothing really about this that would need to constrain it to only std::string instances. --- Source/Core/Common/StringUtil.cpp | 2 +- Source/Core/Common/StringUtil.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index 1bfb54e9f9..1277a18f72 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -437,7 +437,7 @@ void StringPopBackIf(std::string* s, char c) s->pop_back(); } -size_t StringUTF8CodePointCount(const std::string& str) +size_t StringUTF8CodePointCount(std::string_view str) { return str.size() - std::count_if(str.begin(), str.end(), [](char c) -> bool { return (c & 0xC0) == 0x80; }); diff --git a/Source/Core/Common/StringUtil.h b/Source/Core/Common/StringUtil.h index cb58f9fa25..3ae97e5562 100644 --- a/Source/Core/Common/StringUtil.h +++ b/Source/Core/Common/StringUtil.h @@ -170,7 +170,7 @@ std::string WithUnifiedPathSeparators(std::string path); std::string PathToFileName(std::string_view path); void StringPopBackIf(std::string* s, char c); -size_t StringUTF8CodePointCount(const std::string& str); +size_t StringUTF8CodePointCount(std::string_view str); std::string CP1252ToUTF8(std::string_view str); std::string SHIFTJISToUTF8(std::string_view str);