core: drop std::function and ndn::Exclude from common.hpp, add ndn::optional
Change-Id: Ie3983d8b6f9929430efd8ada8d942e3f95755cd4
diff --git a/tests/daemon/table/pit.t.cpp b/tests/daemon/table/pit.t.cpp
index c883ff4..511f2aa 100644
--- a/tests/daemon/table/pit.t.cpp
+++ b/tests/daemon/table/pit.t.cpp
@@ -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-2018, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -24,10 +24,12 @@
*/
#include "table/pit.hpp"
-#include "tests/daemon/face/dummy-face.hpp"
+#include "tests/daemon/face/dummy-face.hpp"
#include "tests/test-common.hpp"
+#include <ndn-cxx/exclude.hpp>
+
namespace nfd {
namespace pit {
namespace tests {
@@ -60,9 +62,9 @@
{
Name name1("ndn:/5vzBNnMst");
Name name2("ndn:/igSGfEIM62");
- Exclude exclude1;
+ ndn::Exclude exclude1;
exclude1.excludeOne(Name::Component("u26p47oep"));
- Exclude exclude2;
+ ndn::Exclude exclude2;
exclude2.excludeBefore(Name::Component("u26p47oep"));
ndn::KeyLocator keyLocator1("ndn:/sGAE3peMHA");
ndn::KeyLocator keyLocator2("ndn:/nIJH6pr4");