commit 28181ee93ac6453fd13dad05e8c43c112b0673a0
author Alexander Afanasyev <aa@cs.fiu.edu> Wed Jun 03 13:58:47 2020 -0400
committer Alexander Afanasyev <aa@cs.fiu.edu> Sat Jun 06 17:53:32 2020 -0400
tree d9f3141887da10f799fad99532a9496c2717a69b
parent 298c4355c3ea7aabe117f425d6e55aed07c84205

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

Change-Id: Ia4a82d7a4a56bfa88e62adab6a1e31bbe459e773

tools/chunks/catchunks/consumer.cpp

diff --git a/tools/chunks/catchunks/consumer.cpp b/tools/chunks/catchunks/consumer.cpp
index e7f751e..12de675 100644
--- a/tools/chunks/catchunks/consumer.cpp
+++ b/tools/chunks/catchunks/consumer.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2016-2019, Regents of the University of California,
+ * Copyright (c) 2016-2020, Regents of the University of California,
  *                          Colorado State University,
  *                          University Pierre & Marie Curie, Sorbonne University.
  *
@@ -30,7 +30,7 @@
 namespace ndn {
 namespace chunks {
 
-Consumer::Consumer(security::v2::Validator& validator, std::ostream& os)
+Consumer::Consumer(security::Validator& validator, std::ostream& os)
   : m_validator(validator)
   , m_outputStream(os)
   , m_nextToPrint(0)
@@ -71,7 +71,7 @@
       m_bufferedData[getSegmentFromPacket(data)] = dataPtr;
       writeInOrderData();
     },
-    [] (const Data&, const security::v2::ValidationError& error) {
+    [] (const Data&, const security::ValidationError& error) {
       NDN_THROW(DataValidationError(error));
     });
 }

tools/chunks/catchunks/consumer.hpp

diff --git a/tools/chunks/catchunks/consumer.hpp b/tools/chunks/catchunks/consumer.hpp
index 10008c9..9972d76 100644
--- a/tools/chunks/catchunks/consumer.hpp
+++ b/tools/chunks/catchunks/consumer.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2016-2018, Regents of the University of California,
+ * Copyright (c) 2016-2020, Regents of the University of California,
  *                          Colorado State University,
  *                          University Pierre & Marie Curie, Sorbonne University.
  *
@@ -31,8 +31,8 @@
 #include "discover-version.hpp"
 #include "pipeline-interests.hpp"
 
-#include <ndn-cxx/security/v2/validation-error.hpp>
-#include <ndn-cxx/security/v2/validator.hpp>
+#include <ndn-cxx/security/validation-error.hpp>
+#include <ndn-cxx/security/validator.hpp>
 
 namespace ndn {
 namespace chunks {
@@ -61,7 +61,7 @@
   {
   public:
     explicit
-    DataValidationError(const security::v2::ValidationError& error)
+    DataValidationError(const security::ValidationError& error)
       : std::runtime_error(boost::lexical_cast<std::string>(error))
     {
     }
@@ -71,7 +71,7 @@
    * @brief Create the consumer
    */
   explicit
-  Consumer(security::v2::Validator& validator, std::ostream& os = std::cout);
+  Consumer(security::Validator& validator, std::ostream& os = std::cout);
 
   /**
    * @brief Run the consumer
@@ -88,7 +88,7 @@
   writeInOrderData();
 
 private:
-  security::v2::Validator& m_validator;
+  security::Validator& m_validator;
   std::ostream& m_outputStream;
   unique_ptr<DiscoverVersion> m_discover;
   unique_ptr<PipelineInterests> m_pipeline;

tools/chunks/catchunks/main.cpp

diff --git a/tools/chunks/catchunks/main.cpp b/tools/chunks/catchunks/main.cpp
index 39b808c..cfb4124 100644
--- a/tools/chunks/catchunks/main.cpp
+++ b/tools/chunks/catchunks/main.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2016-2019, Regents of the University of California,
+ * Copyright (c) 2016-2020, Regents of the University of California,
  *                          Colorado State University,
  *                          University Pierre & Marie Curie, Sorbonne University.
  *
@@ -252,7 +252,7 @@
       return 2;
     }
 
-    Consumer consumer(security::v2::getAcceptAllValidator());
+    Consumer consumer(security::getAcceptAllValidator());
     BOOST_ASSERT(discover != nullptr);
     BOOST_ASSERT(pipeline != nullptr);
     consumer.run(std::move(discover), std::move(pipeline));