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

[search] Comment out world-trie-specific code.

Browse source
This commit is contained in:
Yury Melnichek 2011-09-13 14:00:55 +02:00 • committed by Alex Zolotarev
parent d8d6c2e533
commit cd0691f06a
2 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
indexer/index.hpp
View file

@ -128,11 +128,6 @@ public:
}
}
search::SearchInfo * GetWorldSearchInfo() const
{
return m_pWorldSearchInfo.get();
}
void Add(string const & file)
{
threads::MutexGuard mutexGuard(m_mutex);
@ -145,12 +140,6 @@ public:
m_indexes.push_back(new IndexProxy(file));
UpdateIndexes();
//if (m_indexes.back()->IsWorldData())
//{
// ASSERT ( !m_pWorldSearchInfo.get(), () );
// m_pWorldSearchInfo.reset(m_indexes.back()->GetSearchInfo());
//}
}
void Remove(string const & file)
@ -379,7 +368,6 @@ private:
mutable vector<IndexProxy *> m_indexes;
mutable threads::Mutex m_mutex;
scoped_ptr<search::SearchInfo> m_pWorldSearchInfo;
};
template <class FeatureVectorT, class BaseT> class OffsetToFeatureAdapter : public BaseT

2
search/engine.cpp
View file

@ -17,7 +17,7 @@ namespace search
Engine::Engine(IndexType const * pIndex,
CategoriesHolder & categories)
: m_pIndex(pIndex), m_pSearchInfo(pIndex->GetWorldSearchInfo()),
: m_pIndex(pIndex), m_pSearchInfo(NULL),
m_pCategories(new CategoriesHolder()),
m_pRunner(new threads::ConcurrentRunner), m_pLastQuery(NULL),
m_queriesActive(0)