Upgrade the underlying NFD and ndn-cxx to version 0.6.1 and fixing compilation
Specific changes:
1) model: NetDeviceTransport uses the MTU of NS-3 netDevice
2) utils: Adapting to the updates of the ndn-cxx CustomClock abstraction
Change-Id: Ic0dba06a9afd66a810172d4a512f35f6df6b222a
Refs: #4471, #4514
diff --git a/utils/ndn-time.cpp b/utils/ndn-time.cpp
index 717acde..f4a5955 100644
--- a/utils/ndn-time.cpp
+++ b/utils/ndn-time.cpp
@@ -38,11 +38,11 @@
return " since start of simulation";
}
-boost::posix_time::time_duration
-CustomSystemClock::toPosixDuration(const system_clock::duration& duration) const
+system_clock::duration
+CustomSystemClock::toWaitDuration(system_clock::duration d) const
{
BOOST_ASSERT_MSG(false, "Must not be called");
- return boost::posix_time::microseconds(1);
+ return time::microseconds(1);
}
////////////////////////////////////
@@ -60,11 +60,11 @@
return " since start of simulation";
}
-boost::posix_time::time_duration
-CustomSteadyClock::toPosixDuration(const steady_clock::duration& duration) const
+steady_clock::duration
+CustomSteadyClock::toWaitDuration(steady_clock::duration d) const
{
BOOST_ASSERT_MSG(false, "Must not be called");
- return boost::posix_time::microseconds(1);
+ return time::microseconds(1);
}
} // namespace time