diff options
| author | Maxim Pimenov <m@maps.me> | 2015-07-24 17:06:55 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:58:25 +0300 |
| commit | a5b97c77b982969e0eec4b31fb66af9c624707ba (patch) | |
| tree | 5d84be268ae7a93556e6eab167099eadbda17236 /generator/dumper.cpp | |
| parent | e495039d778dbe6360b05f2b81cecc2efcb00bc3 (diff) | |
[omim] [search] Remove redundant namespaces.
Diffstat (limited to 'generator/dumper.cpp')
| -rw-r--r-- | generator/dumper.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/generator/dumper.cpp b/generator/dumper.cpp index 73c14cfcbc..90554d24dc 100644 --- a/generator/dumper.cpp +++ b/generator/dumper.cpp @@ -164,7 +164,7 @@ namespace feature SearchTokensCollector() : m_currentS(), m_currentCount(0) {} - void operator() (strings::UniString const & s, search::trie::ValueReader::ValueType const &) + void operator()(strings::UniString const & s, trie::ValueReader::ValueType const &) { if (m_currentS == s) { @@ -198,15 +198,14 @@ namespace feature { FilesContainerR container(new FileReader(fPath)); feature::DataHeader header(container); - serial::CodingParams cp(search::GetCPForTrie(header.GetDefCodingParams())); + serial::CodingParams cp(trie::GetCodingParams(header.GetDefCodingParams())); - unique_ptr<search::TrieIterator> const pTrieRoot( - ::trie::reader::ReadTrie(container.GetReader(SEARCH_INDEX_FILE_TAG), - search::trie::ValueReader(cp), - search::trie::EdgeValueReader())); + unique_ptr<trie::DefaultIterator> const pTrieRoot( + trie::ReadTrie(container.GetReader(SEARCH_INDEX_FILE_TAG), trie::ValueReader(cp), + trie::EdgeValueReader())); SearchTokensCollector f; - ::trie::ForEachRef(*pTrieRoot, f, strings::UniString()); + trie::ForEachRef(*pTrieRoot, f, strings::UniString()); f.Finish(); while (!f.tokens.empty()) |