Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation with ICU >= 61

Browse Source
This commit is contained in:
Andrzej Rybczak
2018-04-09 09:12:25 +02:00
parent e912a9d0c3
commit 7a75756ca3
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -5,6 +5,7 @@ ncmpcpp-0.8.2 (????-??-??)
* Search engine now properly interacts with filtering * Search engine now properly interacts with filtering
* Fixed redraw of separator after interface switch while MPD was stopped * Fixed redraw of separator after interface switch while MPD was stopped
* Reset position of a window when fetching lyrics * Reset position of a window when fetching lyrics
* Fixed compilation with ICU >= 61.
ncmpcpp-0.8.1 (2017-10-11) ncmpcpp-0.8.1 (2017-10-11)
* Setting 'colors_enabled' to 'no' no longer results in a crash. * Setting 'colors_enabled' to 'no' no longer results in a crash.

12
src/regex_filter.h
View File

@@ -42,12 +42,12 @@ namespace {
struct StripDiacritics struct StripDiacritics
{ {
static void convert(UnicodeString &s) static void convert(icu::UnicodeString &s)
{ {
if (m_converter == nullptr) if (m_converter == nullptr)
{ {
ErrorCode result; icu::ErrorCode result;
m_converter = Transliterator::createInstance( m_converter = icu::Transliterator::createInstance(
"NFD; [:M:] Remove; NFC", UTRANS_FORWARD, result); "NFD; [:M:] Remove; NFC", UTRANS_FORWARD, result);
if (result.isFailure()) if (result.isFailure())
throw std::runtime_error( throw std::runtime_error(
@@ -58,10 +58,10 @@ struct StripDiacritics
} }
private: private:
static Transliterator *m_converter; static icu::Transliterator *m_converter;
}; };
Transliterator *StripDiacritics::m_converter; icu::Transliterator *StripDiacritics::m_converter;
#endif // BOOST_REGEX_ICU #endif // BOOST_REGEX_ICU
@@ -99,7 +99,7 @@ inline bool search(const std::basic_string<CharT> &s,
#ifdef BOOST_REGEX_ICU #ifdef BOOST_REGEX_ICU
if (ignore_diacritics) if (ignore_diacritics)
{ {
auto us = UnicodeString::fromUTF8( auto us = icu::UnicodeString::fromUTF8(
StringPiece(convertString<char, CharT>::apply(s))); StringPiece(convertString<char, CharT>::apply(s)));
StripDiacritics::convert(us); StripDiacritics::convert(us);
return boost::u32regex_search(us, rx); return boost::u32regex_search(us, rx);