From 60d30945c00708a26056d49b87484b96f1af8fb9 Mon Sep 17 00:00:00 2001
From: Maxim Pimenov <m@maps.me>
Date: Tue, 29 Sep 2015 15:32:37 +0300
Subject: [PATCH] Review fixes.

---
 coding/coding_tests/trie_test.cpp |  2 +-
 coding/trie.hpp                   |  6 +++---
 coding/trie_reader.hpp            | 26 +++++++++++++-------------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/coding/coding_tests/trie_test.cpp b/coding/coding_tests/trie_test.cpp
index ce8f4ecd2d..8576cad436 100644
--- a/coding/coding_tests/trie_test.cpp
+++ b/coding/coding_tests/trie_test.cpp
@@ -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;
diff --git a/coding/trie.hpp b/coding/trie.hpp
index 7df24ff237..589541f450 100644
--- a/coding/trie.hpp
+++ b/coding/trie.hpp
@@ -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
diff --git a/coding/trie_reader.hpp b/coding/trie_reader.hpp
index 08d5b06f77..30c4596fce 100644
--- a/coding/trie_reader.hpp
+++ b/coding/trie_reader.hpp
@@ -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