commit 83be1dae4bfd4d79676d820ba90fd839261ed691
author Junxiao Shi <git@mail1.yoursunny.com> Fri Jun 30 13:37:37 2017 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Fri Jun 30 13:37:37 2017 +0000
tree 67a5f7655ae0be20ee56012e686b160aafb50d65
parent 08e96316beabb13c3df06f7682df6c29479ccfc4

use FaceUri and NetworkMonitor from ndn-cxx/net

This commit also contains a quick fix in LpReliability to avoid
ndn::lp::Packet::wireEncode(EncodingEstimator&).

refs #3940, #4156

Change-Id: Ice8e3649be21dd023ed1f6562c185f9e6721e45e

tools/nfdc/legacy-nfdc.hpp

diff --git a/tools/nfdc/legacy-nfdc.hpp b/tools/nfdc/legacy-nfdc.hpp
index ada0a7d..782c255 100644
--- a/tools/nfdc/legacy-nfdc.hpp
+++ b/tools/nfdc/legacy-nfdc.hpp
@@ -152,7 +152,7 @@
   onCanonizeFailure(const std::string& reason);
 
   void
-  startFaceCreate(const ndn::util::FaceUri& canonicalUri);
+  startFaceCreate(const FaceUri& canonicalUri);
 
   void
   onObtainFaceIdFailure(const std::string& message);