commit f6d32850b17120ed247588f299524876b4007575
author Spyridon Mastorakis <spiros.mastorakis@gmail.com> Wed Sep 27 20:28:52 2017 -0700
committer Alexander Afanasyev <aa@cs.fiu.edu> Wed Nov 01 15:37:56 2017 -0400
tree 8d90ace1cacd3a49e0b0a5772dbbe660fdc223ae
parent f98a341c0e21e3cfebc036fbf83e752893c4ba2d

Upgrade the underlying NFD and ndn-cxx to version 0.6.0

Compilation is currently broken and is fixed in the following commit

Change-Id: Ic0dba06a9afd66a810172d4a512f35f6df6b25a2
Refs: #4306

helper/ndn-fib-helper.hpp

diff --git a/helper/ndn-fib-helper.hpp b/helper/ndn-fib-helper.hpp
index c231be9..381ee2d 100644
--- a/helper/ndn-fib-helper.hpp
+++ b/helper/ndn-fib-helper.hpp
@@ -26,7 +26,7 @@
 #include "ns3/object-vector.h"
 #include "ns3/pointer.h"
 
-#include <ndn-cxx/management/nfd-control-parameters.hpp>
+#include <ndn-cxx/mgmt/nfd/control-parameters.hpp>
 
 namespace ns3 {
 namespace ndn {

helper/ndn-strategy-choice-helper.hpp

diff --git a/helper/ndn-strategy-choice-helper.hpp b/helper/ndn-strategy-choice-helper.hpp
index 302682a..39f9b87 100644
--- a/helper/ndn-strategy-choice-helper.hpp
+++ b/helper/ndn-strategy-choice-helper.hpp
@@ -116,14 +116,11 @@
   NS_ASSERT(l3Protocol != nullptr);
   NS_ASSERT(l3Protocol->getForwarder() != nullptr);
 
-  nfd::Forwarder& forwarder = *l3Protocol->getForwarder();
-  nfd::StrategyChoice& strategyChoice = forwarder.getStrategyChoice();
-
-  if (!strategyChoice.hasStrategy(Strategy::STRATEGY_NAME)) {
-    strategyChoice.install(make_unique<Strategy>(ref(forwarder)));
+  if (!Strategy::canCreate(Strategy::getStrategyName())) {
+    Strategy::template registerType<Strategy>();
   }
 
-  Install(node, namePrefix, Strategy::STRATEGY_NAME);
+  Install(node, namePrefix, Strategy::getStrategyName());
 }
 
 template<class Strategy>