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

lib/icu/Converter: Create() returns std::unique_ptr

Browse Source
This commit is contained in:
Max Kellermann
2019-11-04 15:44:06 +01:00
parent 496f43e25d
commit ed327c597a
6 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,7 @@ IcuConverter::~IcuConverter()
#ifdef HAVE_ICU_CONVERTER
IcuConverter *
std::unique_ptr<IcuConverter>
IcuConverter::Create(const char *charset)
{
#ifdef HAVE_ICU
@@ -56,7 +56,7 @@ IcuConverter::Create(const char *charset)
throw std::runtime_error(FormatString("Failed to initialize charset '%s': %s",
charset, u_errorName(code)).c_str());
return new IcuConverter(converter);
return std::unique_ptr<IcuConverter>(new IcuConverter(converter));
#elif defined(HAVE_ICONV)
iconv_t to = iconv_open("utf-8", charset);
iconv_t from = iconv_open(charset, "utf-8");
@@ -70,7 +70,7 @@ IcuConverter::Create(const char *charset)
charset);
}
return new IcuConverter(to, from);
return std::unique_ptr<IcuConverter>(new IcuConverter(to, from));
#endif
}