RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android][gcc] Fixed compilation error

Browse source
This commit is contained in:
Alex Zolotarev 2012-02-21 17:34:38 +03:00 • committed by Alex Zolotarev
parent afbc786c86
commit 0d6c85b09b
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
search/search_query.cpp
View file

@ -67,7 +67,7 @@ namespace
void Query::SetViewport(m2::RectD viewport[], size_t count)
{
ASSERT_LESS_OR_EQUAL(count, m_rectsCount, ());
ASSERT_LESS_OR_EQUAL(count, static_cast<size_t>(RECTSCOUNT), ());
for (size_t i = 0; i < count; ++i)
{
@ -96,7 +96,7 @@ void Query::SetPreferredLanguage(string const & lang)
void Query::ClearCache()
{
for (size_t i = 0; i < m_rectsCount; ++i)
for (size_t i = 0; i < RECTSCOUNT; ++i)
ClearCache(i);
}
@ -624,7 +624,7 @@ void Query::SearchFeatures()
langs.insert(StringUtf8Multilang::GetLangIndex("en"));
langs.insert(StringUtf8Multilang::GetLangIndex("default"));
for (size_t i = 0; i < m_rectsCount; ++i)
for (size_t i = 0; i < RECTSCOUNT; ++i)
{
if (m_viewport[i].IsValid())
SearchFeatures(tokens, mwmInfo, langs, i);

8
search/search_query.hpp
View file

@ -105,11 +105,9 @@ private:
buffer_vector<strings::UniString, 32> m_tokens;
strings::UniString m_prefix;
/// @todo OMG, this static integral constant does't link ???
//static size_t const m_rectsCount = 2;
enum { m_rectsCount = 2 };
static size_t const RECTSCOUNT = 2;
m2::RectD m_viewport[m_rectsCount];
m2::RectD m_viewport[RECTSCOUNT];
bool m_worldSearch;
/// @return Rect for viewport-distance calculation.
@ -119,7 +117,7 @@ private:
scoped_ptr<LangKeywordsScorer> m_pKeywordsScorer;
vector<vector<uint32_t> > m_offsetsInViewport[m_rectsCount];
vector<vector<uint32_t> > m_offsetsInViewport[RECTSCOUNT];
template <class ParamT, class RefT> class CompareT
{