commit ff10da6575ee8758b35fb9ad025e4b8e2b2eb5e8
author Junxiao Shi <git@mail1.yoursunny.com> Wed Jul 13 17:57:43 2016 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Wed Jul 13 17:57:43 2016 +0000
tree 8201ab4619facde54f8fe7d312adb3956b499e7a
parent af9aa366fd511c20078cb7e73bab2c04ff09b7bf

table: attach unique_ptr<strategy_choice::Entry> onto NameTree

refs #3164

Change-Id: I5cce7e43dba77cdaaa07347ec7ffca13f242113c

daemon/table/name-tree-entry.cpp

diff --git a/daemon/table/name-tree-entry.cpp b/daemon/table/name-tree-entry.cpp
index 87853f2..3244059 100644
--- a/daemon/table/name-tree-entry.cpp
+++ b/daemon/table/name-tree-entry.cpp
@@ -119,15 +119,15 @@
 }
 
 void
-Entry::setStrategyChoiceEntry(shared_ptr<strategy_choice::Entry> strategyChoiceEntry)
+Entry::setStrategyChoiceEntry(unique_ptr<strategy_choice::Entry> strategyChoiceEntry)
 {
   BOOST_ASSERT(strategyChoiceEntry == nullptr || strategyChoiceEntry->m_nameTreeEntry.expired());
 
   if (m_strategyChoiceEntry != nullptr) {
     m_strategyChoiceEntry->m_nameTreeEntry.reset();
   }
+  m_strategyChoiceEntry = std::move(strategyChoiceEntry);
 
-  m_strategyChoiceEntry = strategyChoiceEntry;
   if (m_strategyChoiceEntry != nullptr) {
     m_strategyChoiceEntry->m_nameTreeEntry = this->shared_from_this();
   }