commit 63b3ae818f6dc740568aa66959558d273d5180e3
author Davide Pesavento <davidepesa@gmail.com> Fri Mar 24 23:53:24 2023 -0400
committer Davide Pesavento <davidepesa@gmail.com> Mon Mar 27 14:05:04 2023 -0400
tree 31f3bf594748c68756da3a97c26a26638eb2dceb
parent 4064127b977a273e3d85c2aae1adb73c764f5edb

tools: fix compilation with latest ndn-cxx

Change-Id: Ifded624f3256452be98f288f9193dd26e464cd36

tests/tools/nfdc/execute-command-fixture.hpp

diff --git a/tests/tools/nfdc/execute-command-fixture.hpp b/tests/tools/nfdc/execute-command-fixture.hpp
index 7d73355..6c41c03 100644
--- a/tests/tools/nfdc/execute-command-fixture.hpp
+++ b/tests/tools/nfdc/execute-command-fixture.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2023,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -51,7 +51,7 @@
     registerCommands(parser);
     auto [noun, verb, ca, exec] = parser.parse(args, ParseMode::ONE_SHOT);
 
-    Controller controller(face, m_keyChain);
+    ndn::nfd::Controller controller(face, m_keyChain);
     ExecuteContext ctx{noun, verb, ca, 0, out, err, face, m_keyChain, controller};
     exec(ctx);
     exitCode = ctx.exitCode;

tests/tools/nfdc/status-fixture.hpp

diff --git a/tests/tools/nfdc/status-fixture.hpp b/tests/tools/nfdc/status-fixture.hpp
index c82e79b..87ddba8 100644
--- a/tests/tools/nfdc/status-fixture.hpp
+++ b/tests/tools/nfdc/status-fixture.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2023,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -107,7 +107,7 @@
 
 protected:
   ValidatorUniquePtr validator;
-  Controller controller;
+  ndn::nfd::Controller controller;
 
   M module;
 

tests/tools/nfdc/status-report.t.cpp

diff --git a/tests/tools/nfdc/status-report.t.cpp b/tests/tools/nfdc/status-report.t.cpp
index fbff27a..04b9b86 100644
--- a/tests/tools/nfdc/status-report.t.cpp
+++ b/tests/tools/nfdc/status-report.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2023,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -60,15 +60,15 @@
   void
   setResult(uint32_t res, time::nanoseconds delay)
   {
-    BOOST_ASSERT(delay > time::nanoseconds::zero());
+    BOOST_ASSERT(delay > 0_ns);
     m_res = res;
     m_delay = delay;
   }
 
   void
-  fetchStatus(Controller&,
+  fetchStatus(ndn::nfd::Controller&,
               const std::function<void()>& onSuccess,
-              const Controller::DatasetFailCallback& onFailure,
+              const ndn::nfd::DatasetFailureCallback& onFailure,
               const CommandOptions&) final
   {
     ++nFetchStatusCalls;
@@ -151,7 +151,7 @@
 protected:
   ndn::util::DummyClientFace face;
   ValidatorNull validator;
-  Controller controller;
+  ndn::nfd::Controller controller;
   StatusReportTester report;
 
   uint32_t res;