commit 838c4f1a2afb70c8ce3d741973f7418e1ac14033
author Junxiao Shi <git@mail1.yoursunny.com> Mon Nov 03 18:55:24 2014 -0700
committer Alex Afanasyev <alexander.afanasyev@ucla.edu> Sun Nov 09 19:16:07 2014 -0800
tree b5935cb7557f9bb2ad519e178c45b446d7bf844d
parent 7c7c136dc4666dfdc0e6a37f77f487470b9b5f49

table: simplify StrategyChoice with C++11 features

refs #2100

Change-Id: If0082c8561d706df86e92c14cb87762962ff200b

daemon/mgmt/strategy-choice-manager.cpp

diff --git a/daemon/mgmt/strategy-choice-manager.cpp b/daemon/mgmt/strategy-choice-manager.cpp
index 962349d..e93353b 100644
--- a/daemon/mgmt/strategy-choice-manager.cpp
+++ b/daemon/mgmt/strategy-choice-manager.cpp
@@ -162,7 +162,9 @@
   if (m_strategyChoice.insert(prefix, selectedStrategy))
     {
       NFD_LOG_DEBUG("strategy-choice result: SUCCESS");
-      parameters.setStrategy(*m_strategyChoice.get(prefix));
+      auto currentStrategyChoice = m_strategyChoice.get(prefix);
+      BOOST_ASSERT(currentStrategyChoice.first);
+      parameters.setStrategy(currentStrategyChoice.second);
       setResponse(response, 200, "Success", parameters.wireEncode());
     }
   else