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.hpp

diff --git a/daemon/table/name-tree-entry.hpp b/daemon/table/name-tree-entry.hpp
index c650587..7bade1f 100644
--- a/daemon/table/name-tree-entry.hpp
+++ b/daemon/table/name-tree-entry.hpp
@@ -120,9 +120,9 @@
   getMeasurementsEntry() const;
 
   void
-  setStrategyChoiceEntry(shared_ptr<strategy_choice::Entry> strategyChoiceEntry);
+  setStrategyChoiceEntry(unique_ptr<strategy_choice::Entry> strategyChoiceEntry);
 
-  shared_ptr<strategy_choice::Entry>
+  strategy_choice::Entry*
   getStrategyChoiceEntry() const;
 
 private:
@@ -136,7 +136,7 @@
   unique_ptr<fib::Entry> m_fibEntry;
   std::vector<shared_ptr<pit::Entry> > m_pitEntries;
   shared_ptr<measurements::Entry> m_measurementsEntry;
-  shared_ptr<strategy_choice::Entry> m_strategyChoiceEntry;
+  unique_ptr<strategy_choice::Entry> m_strategyChoiceEntry;
 
   // get the Name Tree Node that is associated with this Name Tree Entry
   Node* m_node;
@@ -211,10 +211,10 @@
   return m_measurementsEntry;
 }
 
-inline shared_ptr<strategy_choice::Entry>
+inline strategy_choice::Entry*
 Entry::getStrategyChoiceEntry() const
 {
-  return m_strategyChoiceEntry;
+  return m_strategyChoiceEntry.get();
 }
 
 } // namespace name_tree