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
diff --git a/tests/unit-tests/helper/ndn-strategy-choice-helper.t.cpp b/tests/unit-tests/helper/ndn-strategy-choice-helper.t.cpp
index d8f9f4e..e06a93d 100644
--- a/tests/unit-tests/helper/ndn-strategy-choice-helper.t.cpp
+++ b/tests/unit-tests/helper/ndn-strategy-choice-helper.t.cpp
@@ -143,9 +143,10 @@
class NullStrategy : public nfd::fw::Strategy {
public:
- NullStrategy(nfd::Forwarder& forwarder)
- : Strategy(forwarder, STRATEGY_NAME)
+ NullStrategy(nfd::Forwarder& forwarder, const Name& name = getStrategyName())
+ : Strategy(forwarder)
{
+ this->setInstanceName(name);
}
virtual void
@@ -156,11 +157,13 @@
}
public:
- static const Name STRATEGY_NAME;
+ static const Name& getStrategyName()
+ {
+ static Name strategyName("ndn:/localhost/nfd/strategy/unit-tests/null-strategy/%FD%00");
+ return strategyName;
+ }
};
-const Name NullStrategy::STRATEGY_NAME = "ndn:/localhost/nfd/strategy/unit-tests/null-strategy";
-
// template<class Strategy>
// static void
// Install(Ptr<Node> node, const Name& namePrefix);