commit a158370ecbfae9d87a20df6b1a0dbee30f3ac891
author Alexander Afanasyev <aa@cs.fiu.edu> Wed Jun 03 13:55:45 2020 -0400
committer Alexander Afanasyev <aa@cs.fiu.edu> Sat Jun 06 16:30:06 2020 -0400
tree 459382a4d184de6a7f0669bf149da898f9f5e09f
parent 34b2b57831a301315e5e509c50b654bcbbf52adb

Adjust includes for the updated locations of ndn-cxx security headers

Change-Id: I5a94879966de2c166fed8dedda0ed1d65c33c300

tools/nfdc/status-report.hpp

diff --git a/tools/nfdc/status-report.hpp b/tools/nfdc/status-report.hpp
index 1658852..f88b175 100644
--- a/tools/nfdc/status-report.hpp
+++ b/tools/nfdc/status-report.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2017,  Regents of the University of California,
+ * Copyright (c) 2014-2020,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -29,7 +29,7 @@
 #include "module.hpp"
 #include <ndn-cxx/face.hpp>
 #include <ndn-cxx/security/key-chain.hpp>
-#include <ndn-cxx/security/v2/validator.hpp>
+#include <ndn-cxx/security/validator.hpp>
 
 namespace nfd {
 namespace tools {
@@ -37,7 +37,7 @@
 
 using ndn::Face;
 using ndn::KeyChain;
-using ndn::security::v2::Validator;
+using ndn::security::Validator;
 
 enum class ReportFormat {
   XML = 1,

tools/nfdc/status.cpp

diff --git a/tools/nfdc/status.cpp b/tools/nfdc/status.cpp
index a47d12b..441c3a9 100644
--- a/tools/nfdc/status.cpp
+++ b/tools/nfdc/status.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2018,  Regents of the University of California,
+ * Copyright (c) 2014-2020,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -72,7 +72,7 @@
   }
 
   uint32_t code = report.collect(ctx.face, ctx.keyChain,
-                                 ndn::security::v2::getAcceptAllValidator(),
+                                 ndn::security::getAcceptAllValidator(),
                                  CommandOptions());
   if (code != 0) {
     ctx.exitCode = 1;