model+apps+utils+examples+ci+docs: Update code for changes in ns-2.23
- Replace removed RandomVariable with RandomVariableStream
- Replace deprecated usages of AddTraceSource
- Update changed LogComponent interface
ci: This commit also integrates a script for Jenkins and Travis CI to
clone NS-3 and pybindgen repositories, so the code can be built.
docs: Update to reflect new home of ndnSIM and related sources
Change-Id: Ic14e1269bf15366b0041fd670c577053b6704dc7
Refs: #3122, #3123
diff --git a/model/cs/content-store-with-stats.hpp b/model/cs/content-store-with-stats.hpp
index 979a5e5..3b84ac2 100644
--- a/model/cs/content-store-with-stats.hpp
+++ b/model/cs/content-store-with-stats.hpp
@@ -63,6 +63,9 @@
virtual inline void
Print(std::ostream& os) const;
+public:
+ typedef void (*RemoveCsEntryCallback)(Ptr<const Entry>, Time);
+
private:
static LogComponent g_log; ///< @brief Logging variable
@@ -77,7 +80,7 @@
template<class Policy>
LogComponent ContentStoreWithStats<Policy>::g_log = LogComponent(("ndn.cs.Stats."
- + Policy::GetName()).c_str());
+ + Policy::GetName()).c_str(), __FILE__);
template<class Policy>
TypeId
@@ -91,7 +94,8 @@
.AddTraceSource("WillRemoveEntry",
"Trace called just before content store entry will be removed",
- MakeTraceSourceAccessor(&ContentStoreWithStats<Policy>::m_willRemoveEntry))
+ MakeTraceSourceAccessor(&ContentStoreWithStats<Policy>::m_willRemoveEntry),
+ "ns3::ndn::cs::ContentStoreWithStats::RemoveCsEntryCallback")
// trace stuff here
;