oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

util/AllocatedString: std::string_view support

Browse Source
This commit is contained in:
Max Kellermann
2020-04-03 15:12:08 +02:00
parent f04a245769
commit 915c48f748
6 changed files with 18 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/icu/Compare.hxx
View File

@@ -38,12 +38,12 @@ public:
IcuCompare(const IcuCompare &src) noexcept
:needle(src
? AllocatedString<>::Duplicate(src.needle.c_str())
? AllocatedString<>::Duplicate(src.needle)
: nullptr) {}
IcuCompare &operator=(const IcuCompare &src) noexcept {
needle = src
? AllocatedString<>::Duplicate(src.needle.c_str())
? AllocatedString<>::Duplicate(src.needle)
: nullptr;
return *this;
}

4
src/lib/icu/Converter.cxx
View File

@@ -95,7 +95,7 @@ DoConvert(iconv_t conv, const char *src)
if (in_left > 0)
throw std::runtime_error("Charset conversion failed");
return AllocatedString<>::Duplicate(buffer, sizeof(buffer) - out_left);
return AllocatedString<>::Duplicate({buffer, sizeof(buffer) - out_left});
}
#endif
@@ -151,7 +151,7 @@ IcuConverter::FromUTF8(const char *s) const
throw std::runtime_error(FormatString("Failed to convert from Unicode: %s",
u_errorName(code)).c_str());
return AllocatedString<>::Duplicate(buffer, target);
return AllocatedString<>::Duplicate({buffer, size_t(target - buffer)});
#elif defined(HAVE_ICONV)
return DoConvert(from_utf8, s);