fw: move STRATEGY_NAME to getStrategyName static function
This avoids potential problems with static initialization order.
refs #3868
Change-Id: I13f0ff6c51c0a3bd43af7993233ff63a4bca9cf9
diff --git a/daemon/fw/ncc-strategy.hpp b/daemon/fw/ncc-strategy.hpp
index 9403dd5..7e63333 100644
--- a/daemon/fw/ncc-strategy.hpp
+++ b/daemon/fw/ncc-strategy.hpp
@@ -37,7 +37,10 @@
{
public:
explicit
- NccStrategy(Forwarder& forwarder, const Name& name = STRATEGY_NAME);
+ NccStrategy(Forwarder& forwarder, const Name& name = getStrategyName());
+
+ static const Name&
+ getStrategyName();
virtual void
afterReceiveInterest(const Face& inFace, const Interest& interest,
@@ -128,9 +131,6 @@
void
timeoutOnBestFace(weak_ptr<pit::Entry> pitEntryWeak);
-public:
- static const Name STRATEGY_NAME;
-
protected:
static const time::microseconds DEFER_FIRST_WITHOUT_BEST_FACE;
static const time::microseconds DEFER_RANGE_WITHOUT_BEST_FACE;