commit 25e4d8fd84669732da5225742529653cd6624d4f
author Alexander Afanasyev <aa@cs.fiu.edu> Mon Jul 29 13:44:04 2019 -0400
committer Alexander Afanasyev <aa@cs.fiu.edu> Sun May 31 14:22:08 2020 -0400
tree b185130a5d5040a19fc5a83b05f94d095cb3c7e9
parent 11dfcb76f55767d204e39b1c35ed36f5e35c8686

Compilation fixes after upgrade to NFD 0.6.6 and removal of old-style CS

Change-Id: I5472ae71675d8419d8d6c70990182ef028803087

helper/ndn-stack-helper.cpp

diff --git a/helper/ndn-stack-helper.cpp b/helper/ndn-stack-helper.cpp
index 09f0d8c..cf60551 100644
--- a/helper/ndn-stack-helper.cpp
+++ b/helper/ndn-stack-helper.cpp
@@ -53,7 +53,6 @@
   : m_isForwarderStatusManagerDisabled(false)
   , m_isStrategyChoiceManagerDisabled(false)
   , m_needSetDefaultRoutes(false)
-  , m_maxCsSize(100)
 {
   setCustomNdnCxxClocks();
 
@@ -173,7 +172,7 @@
     ndn->getConfig().put("ndnSIM.disable_strategy_choice_manager", true);
   }
 
-  ndn->getConfig().put("tables.cs_max_packets", (m_maxCsSize == 0) ? 1 : m_maxCsSize);
+  ndn->getConfig().put("tables.cs_max_packets", m_maxCsSize);
 
   ndn->setCsReplacementPolicy(m_csPolicyCreationFunc);
 

helper/ndn-stack-helper.hpp

diff --git a/helper/ndn-stack-helper.hpp b/helper/ndn-stack-helper.hpp
index c2ab6f0..f9ff0f8 100644
--- a/helper/ndn-stack-helper.hpp
+++ b/helper/ndn-stack-helper.hpp
@@ -255,7 +255,7 @@
   ObjectFactory m_ndnFactory;
 
   bool m_needSetDefaultRoutes;
-  size_t m_maxCsSize;
+  size_t m_maxCsSize = 100;
 
   typedef std::function<std::unique_ptr<nfd::cs::Policy>()> PolicyCreationCallback;
   PolicyCreationCallback m_csPolicyCreationFunc;