kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Rebase fixes.

Browse source
This commit is contained in:
Maxim Pimenov 2015-12-04 19:42:36 +03:00 • committed by Sergey Yershov
parent ed7c39ea21
commit 936b9cd747
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
search/intermediate_result.cpp
View file

@ -18,7 +18,6 @@
#include "3party/opening_hours/opening_hours.hpp"
namespace search
{
@ -194,8 +193,8 @@ Result PreResult2::GenerateFinalResult(storage::CountryInfoGetter const & infoGe
}
Result PreResult2::GeneratePointResult(storage::CountryInfoGetter const & infoGetter,
CategoriesHolder const * pCat,
set<uint32_t> const * pTypes, int8_t locale) const
CategoriesHolder const * pCat,
set<uint32_t> const * pTypes, int8_t locale) const
{
uint32_t const type = GetBestType(pTypes);
return Result(m_id, GetCenter(), m_str, GetRegionName(infoGetter, type),