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/command-definition.hpp

diff --git a/tools/nfdc/command-definition.hpp b/tools/nfdc/command-definition.hpp
index 813e744..7d8c8f0 100644
--- a/tools/nfdc/command-definition.hpp
+++ b/tools/nfdc/command-definition.hpp
@@ -76,13 +76,13 @@
 
   /** \brief FaceUri
    *
-   *  The argument appears in CommandArguments as ndn::util::FaceUri.
+   *  The argument appears in CommandArguments as ndn::FaceUri.
    */
   FACE_URI,
 
   /** \brief FaceId or FaceUri
    *
-   *  The argument appears in CommandArguments as either uint64_t or ndn::util::FaceUri.
+   *  The argument appears in CommandArguments as either uint64_t or ndn::FaceUri.
    */
   FACE_ID_OR_URI,