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

Review fixes.

Browse source
This commit is contained in:
Maxim Pimenov 2015-09-29 15:32:37 +03:00 • committed by Sergey Yershov
parent 764a72f50b
commit 60d30945c0
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
coding/coding_tests/trie_test.cpp
View file

@ -237,7 +237,7 @@ UNIT_TEST(TrieBuilder_Build)
reverse(serial.begin(), serial.end());
MemReader memReader = MemReader(&serial[0], serial.size());
using IteratorType = trie::Iterator<trie::FixedSizeValueReader<4>::ValueType>;
using TIterator = trie::Iterator<trie::FixedSizeValueReader<4>::ValueType>;
auto const root = trie::ReadTrie(memReader, trie::FixedSizeValueReader<4>());
vector<KeyValuePair> res;
KeyValuePairBackInserter f;

6
coding/trie.hpp
View file

@ -4,7 +4,7 @@
#include "base/base.hpp"
#include "base/buffer_vector.hpp"
#include "std/shared_ptr.hpp"
#include "std/unique_ptr.hpp"
namespace trie
{
@ -33,8 +33,8 @@ public:
virtual ~Iterator() {}
virtual shared_ptr<Iterator<TValue>> Clone() const = 0;
virtual shared_ptr<Iterator<TValue>> GoToEdge(size_t i) const = 0;
virtual unique_ptr<Iterator<TValue>> Clone() const = 0;
virtual unique_ptr<Iterator<TValue>> GoToEdge(size_t i) const = 0;
};
struct EmptyValueReader

26
coding/trie_reader.hpp
View file

@ -33,16 +33,16 @@ public:
}
// trie::Iterator overrides:
shared_ptr<Iterator<ValueType>> Clone() const override
unique_ptr<Iterator<ValueType>> Clone() const override
{
return make_shared<LeafIterator0<TValueReader>>(*this);
return make_unique<LeafIterator0<TValueReader>>(*this);
}
shared_ptr<Iterator<ValueType>> GoToEdge(size_t i) const override
unique_ptr<Iterator<ValueType>> GoToEdge(size_t i) const override
{
ASSERT(false, (i));
UNUSED_VALUE(i);
return NULL;
return nullptr;
}
};
@ -74,12 +74,12 @@ public:
}
// trie::Iterator overrides:
shared_ptr<Iterator<ValueType>> Clone() const override
unique_ptr<Iterator<ValueType>> Clone() const override
{
return make_shared<Iterator0<TReader, TValueReader>>(*this);
return make_unique<Iterator0<TReader, TValueReader>>(*this);
}
shared_ptr<Iterator<ValueType>> GoToEdge(size_t i) const override
unique_ptr<Iterator<ValueType>> GoToEdge(size_t i) const override
{
ASSERT_LESS(i, this->m_edge.size(), ());
uint32_t const offset = m_edgeInfo[i].m_offset;
@ -93,10 +93,10 @@ public:
SharedMemReader memReader(size);
m_reader.Read(offset, memReader.Data(), size);
if (m_edgeInfo[i].m_isLeaf)
return make_shared<LeafIterator0<SharedMemReader, TValueReader>>(
return make_unique<LeafIterator0<SharedMemReader, TValueReader>>(
memReader, m_valueReader);
else
return make_shared<Iterator0<SharedMemReader, TValueReader>>(
return make_unique<Iterator0<SharedMemReader, TValueReader>>(
memReader, m_valueReader,
this->m_edge[i].m_str.back());
}
@ -104,10 +104,10 @@ public:
*/
{
if (m_edgeInfo[i].m_isLeaf)
return make_shared<LeafIterator0<TValueReader>>(m_reader.SubReader(offset, size),
return make_unique<LeafIterator0<TValueReader>>(m_reader.SubReader(offset, size),
m_valueReader);
else
return make_shared<Iterator0<TReader, TValueReader>>(
return make_unique<Iterator0<TReader, TValueReader>>(
m_reader.SubReader(offset, size), m_valueReader, this->m_edge[i].m_str.back());
}
}
@ -190,10 +190,10 @@ private:
// Returns iterator to the root of the trie.
template <class TReader, class TValueReader>
shared_ptr<Iterator<typename TValueReader::ValueType>> ReadTrie(
unique_ptr<Iterator<typename TValueReader::ValueType>> ReadTrie(
TReader const & reader, TValueReader valueReader = TValueReader())
{
return make_shared<Iterator0<TReader, TValueReader>>(reader, valueReader, DEFAULT_CHAR);
return make_unique<Iterator0<TReader, TValueReader>>(reader, valueReader, DEFAULT_CHAR);
}
} // namespace trie