From 48c686fb1620e8c776fd4738f81f6933d0924460 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Fri, 26 Feb 2016 21:10:27 +0300 Subject: [PATCH] =?UTF-8?q?Avoid=20UniChar=20conflict=20with=20Apple?= =?UTF-8?q?=E2=80=99s=20define.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- indexer/search_string_utils.hpp | 7 +++---- 1 file 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