summaryrefslogtreecommitdiff
path: root/zen/zstring.h
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2020-07-22 11:37:03 -0400
committerB Stack <bgstack15@gmail.com>2020-07-22 11:37:03 -0400
commitc95b3937fef3e2c63768f1b3b1dc2c898f23d91d (patch)
tree10260e25ae905564f7978b83fc4e316670f987c6 /zen/zstring.h
parentMerge branch '10.25' into 'master' (diff)
downloadFreeFileSync-c95b3937fef3e2c63768f1b3b1dc2c898f23d91d.tar.gz
FreeFileSync-c95b3937fef3e2c63768f1b3b1dc2c898f23d91d.tar.bz2
FreeFileSync-c95b3937fef3e2c63768f1b3b1dc2c898f23d91d.zip
add upstream 11.0
Diffstat (limited to 'zen/zstring.h')
-rw-r--r--zen/zstring.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/zen/zstring.h b/zen/zstring.h
index e262603e..adfd671b 100644
--- a/zen/zstring.h
+++ b/zen/zstring.h
@@ -28,7 +28,7 @@ using Zstringc = zen::Zbase<char>;
// - different UTF-8 encoding length of upper-case chars
// - different number of upper case chars (e.g. "ߢ => "SS" on macOS)
// - output is Unicode-normalized
-Zstring makeUpperCopy(const Zstring& str);
+Zstring getUpperCase(const Zstring& str);
//Windows, Linux: precomposed
//macOS: decomposed
@@ -43,11 +43,11 @@ Zstring replaceCpyAsciiNoCase(const Zstring& str, const Zstring& oldTerm, const
//------------------------------------------------------------------------------------------
-inline bool equalNoCase(const Zstring& lhs, const Zstring& rhs) { return makeUpperCopy(lhs) == makeUpperCopy(rhs); }
+inline bool equalNoCase(const Zstring& lhs, const Zstring& rhs) { return getUpperCase(lhs) == getUpperCase(rhs); }
struct ZstringNoCase //use as STL container key: avoid needless upper-case conversions during std::map<>::find()
{
- ZstringNoCase(const Zstring& str) : upperCase(makeUpperCopy(str)) {}
+ ZstringNoCase(const Zstring& str) : upperCase(getUpperCase(str)) {}
Zstring upperCase;
std::strong_ordering operator<=>(const ZstringNoCase& other) const = default;
bgstack15