commit 7f566dd0e509dae80c6ff3d94a011b7339dd18c8
author Junxiao Shi <git@mail1.yoursunny.com> Tue Dec 27 02:28:31 2016 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Tue Dec 27 02:28:31 2016 +0000
tree 538b9edf46b8f8b923f1c0fde3f5eabc97fa9dbc
parent 65800d22e75ebd99cfa84c39df9e65ba65a90028

table: StrategyChoice no longer supports installed instances

All strategies should be registered in the strategy registry.

refs #3868

Change-Id: Ie89b0ffaf9943e591f9f2d80546b013d5cc16ff8

daemon/table/strategy-choice-entry.hpp

diff --git a/daemon/table/strategy-choice-entry.hpp b/daemon/table/strategy-choice-entry.hpp
index c6a1326..e1f1eb3 100644
--- a/daemon/table/strategy-choice-entry.hpp
+++ b/daemon/table/strategy-choice-entry.hpp
@@ -67,21 +67,16 @@
   fw::Strategy&
   getStrategy() const
   {
-    BOOST_ASSERT(m_strategyPtr != nullptr);
-    return *m_strategyPtr;
+    BOOST_ASSERT(m_strategy != nullptr);
+    return *m_strategy;
   }
 
-  DEPRECATED(
-  void
-  setStrategy(fw::Strategy& strategy));
-
   void
   setStrategy(unique_ptr<fw::Strategy> strategy);
 
 private:
   Name m_prefix;
   unique_ptr<fw::Strategy> m_strategy;
-  fw::Strategy* m_strategyPtr;
 
   name_tree::Entry* m_nameTreeEntry;
   friend class name_tree::Entry;