commit 037f4ab4b62f42447c78d25ede0755f98409c9cb
author Junxiao Shi <git@mail1.yoursunny.com> Tue Dec 13 04:27:06 2016 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Tue Dec 13 04:27:06 2016 +0000
tree 60d785f73f23c83583100ad67c7c063009c67f7f
parent f15058ab061fe2756472b1d33ee1c083c58460de

fw: move STRATEGY_NAME to getStrategyName static function

This avoids potential problems with static initialization order.

refs #3868

Change-Id: I13f0ff6c51c0a3bd43af7993233ff63a4bca9cf9

daemon/fw/multicast-strategy.hpp

diff --git a/daemon/fw/multicast-strategy.hpp b/daemon/fw/multicast-strategy.hpp
index 2ab3f8d..e656e45 100644
--- a/daemon/fw/multicast-strategy.hpp
+++ b/daemon/fw/multicast-strategy.hpp
@@ -36,14 +36,14 @@
 class MulticastStrategy : public Strategy
 {
 public:
-  MulticastStrategy(Forwarder& forwarder, const Name& name = STRATEGY_NAME);
+  MulticastStrategy(Forwarder& forwarder, const Name& name = getStrategyName());
+
+  static const Name&
+  getStrategyName();
 
   virtual void
   afterReceiveInterest(const Face& inFace, const Interest& interest,
                        const shared_ptr<pit::Entry>& pitEntry) override;
-
-public:
-  static const Name STRATEGY_NAME;
 };
 
 } // namespace fw