commit 78926c9083bd94806e2bebac642baa1600e731b7
author Junxiao Shi <git@mail1.yoursunny.com> Sat Feb 28 22:56:06 2015 -0700
committer Junxiao Shi <git@mail1.yoursunny.com> Sat Feb 28 23:02:31 2015 -0700
tree eca98fab368d28dab6764debb68338e2105f4e26
parent e84044e87d68e201764c530d5e7765997d5df2e7

face/rib/tools: avoid deprecate Block::fromBuffer overloads

refs #2553

Change-Id: I32ea424ab7547f59fea2fca70ad6f41cd90bab58

tools/nfdc.cpp

diff --git a/tools/nfdc.cpp b/tools/nfdc.cpp
index 02fe28a..207d3ee 100644
--- a/tools/nfdc.cpp
+++ b/tools/nfdc.cpp
@@ -178,10 +178,11 @@
                                     const ndn::util::FaceUri& canonicalUri)
 {
   size_t offset = 0;
+  bool isOk = false;
   ndn::Block block;
-  bool ok = ndn::Block::fromBuffer(data, offset, block);
+  std::tie(isOk, block) = ndn::Block::fromBuffer(data, offset);
 
-  if (!ok) {
+  if (!isOk) {
     if (m_allowCreate) {
       startFaceCreate(canonicalUri);
     }