diff options
| author | Alex Zolotarev <alex@maps.me> | 2016-02-26 21:10:27 +0300 |
|---|---|---|
| committer | Sergey Yershov <yershov@corp.mail.ru> | 2016-03-23 16:49:32 +0300 |
| commit | 48c686fb1620e8c776fd4738f81f6933d0924460 (patch) | |
| tree | eaafded9d933ccc24cc93e2d17c6777bc24ac2f1 /indexer/search_string_utils.hpp | |
| parent | 4796e428ba9899d477b0a55ae0ff37b16f6aaf7f (diff) | |
Avoid UniChar conflict with Apple’s define.
Diffstat (limited to 'indexer/search_string_utils.hpp')
| -rw-r--r-- | indexer/search_string_utils.hpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indexer/search_string_utils.hpp b/indexer/search_string_utils.hpp index a79851a92f..5abf4c19c9 100644 --- a/indexer/search_string_utils.hpp +++ b/indexer/search_string_utils.hpp @@ -10,11 +10,10 @@ namespace search // It does some magic text transformation which greatly helps us to improve our search. inline strings::UniString NormalizeAndSimplifyString(string const & s) { - using namespace strings; - UniString uniString = MakeUniString(s); + strings::UniString uniString = strings::MakeUniString(s); for (size_t i = 0; i < uniString.size(); ++i) { - UniChar & c = uniString[i]; + strings::UniChar & c = uniString[i]; switch (c) { // Replace "d with stroke" to simple d letter. Used in Vietnamese. @@ -48,7 +47,7 @@ inline strings::UniString NormalizeAndSimplifyString(string const & s) NormalizeInplace(uniString); // Remove accents that can appear after NFKD normalization. - uniString.erase_if([](UniChar const & c) + uniString.erase_if([](strings::UniChar const & c) { // ̀ COMBINING GRAVE ACCENT // ́ COMBINING ACUTE ACCENT |