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/examples/ndn-load-balancer/random-load-balancer-strategy.cpp b/examples/ndn-load-balancer/random-load-balancer-strategy.cpp
index ac4eff4..4f61162 100644
--- a/examples/ndn-load-balancer/random-load-balancer-strategy.cpp
+++ b/examples/ndn-load-balancer/random-load-balancer-strategy.cpp
@@ -36,12 +36,10 @@
namespace nfd {
namespace fw {
-const Name
- RandomLoadBalancerStrategy::STRATEGY_NAME("ndn:/localhost/nfd/strategy/random-load-balancer");
-
RandomLoadBalancerStrategy::RandomLoadBalancerStrategy(Forwarder& forwarder, const Name& name)
- : Strategy(forwarder, name)
+ : Strategy(forwarder)
{
+ this->setInstanceName(makeInstanceName(name, getStrategyName()));
}
RandomLoadBalancerStrategy::~RandomLoadBalancerStrategy()
@@ -97,5 +95,12 @@
this->sendInterest(pitEntry, selected->getFace(), interest);
}
+const Name&
+RandomLoadBalancerStrategy::getStrategyName()
+{
+ static Name strategyName("ndn:/localhost/nfd/strategy/random-load-balancer/%FD%01");
+ return strategyName;
+}
+
} // namespace fw
} // namespace nfd
diff --git a/examples/ndn-load-balancer/random-load-balancer-strategy.hpp b/examples/ndn-load-balancer/random-load-balancer-strategy.hpp
index 997bb56..ef11ae8 100644
--- a/examples/ndn-load-balancer/random-load-balancer-strategy.hpp
+++ b/examples/ndn-load-balancer/random-load-balancer-strategy.hpp
@@ -36,7 +36,7 @@
class RandomLoadBalancerStrategy : public Strategy {
public:
- RandomLoadBalancerStrategy(Forwarder& forwarder, const Name& name = STRATEGY_NAME);
+ RandomLoadBalancerStrategy(Forwarder& forwarder, const Name& name = getStrategyName());
virtual ~RandomLoadBalancerStrategy() override;
@@ -44,8 +44,8 @@
afterReceiveInterest(const Face& inFace, const Interest& interest,
const shared_ptr<pit::Entry>& pitEntry) override;
-public:
- static const Name STRATEGY_NAME;
+ static const Name&
+ getStrategyName();
protected:
boost::random::mt19937 m_randomGenerator;