[search] change string to char const * for affics

This commit is contained in:
Kirill Zhdanovich 2014-03-24 18:31:33 +03:00 committed by Alex Zolotarev
parent 87a6919eba
commit a39175e9b7

View file

@ -98,7 +98,7 @@ public:
/// @todo Move prefixes, suffixes into separate file (autogenerated).
/// "Набережная" улица встречается в городах
string affics[] =
char const * affics[] =
{
// Russian
"аллея", "бульвар", "набережная", "переулок", "площадь", "проезд", "проспект", "шоссе", "тупик", "улица", "тракт", "ал", "бул", "наб", "пер", "пл", "пр", "просп", "ш", "туп", "ул", "тр",
@ -175,17 +175,9 @@ void GetStreetName(strings::SimpleTokenizer iter, string & streetName)
string const s = strings::MakeLowerCase(*iter);
++iter;
bool flag = true;
for (size_t i = 0; i < ARRAY_SIZE(affics); ++i)
{
if (s == affics[i])
{
flag = false;
break;
}
}
char const ** end = affics + ARRAY_SIZE(affics);
if (flag)
if (find(affics, end, s) == end)
streetName += s;
}
}