core: drop std::function and ndn::Exclude from common.hpp, add ndn::optional
Change-Id: Ie3983d8b6f9929430efd8ada8d942e3f95755cd4
diff --git a/tests/rib/readvertise/client-to-nlsr-readvertise-policy.t.cpp b/tests/rib/readvertise/client-to-nlsr-readvertise-policy.t.cpp
index 6535a87..6925de1 100644
--- a/tests/rib/readvertise/client-to-nlsr-readvertise-policy.t.cpp
+++ b/tests/rib/readvertise/client-to-nlsr-readvertise-policy.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,
@@ -46,7 +46,7 @@
RibRouteRef rrr{entry, routeIt};
ClientToNlsrReadvertisePolicy policy;
- ndn::optional<ReadvertiseAction> action = policy.handleNewRoute(rrr);
+ optional<ReadvertiseAction> action = policy.handleNewRoute(rrr);
BOOST_REQUIRE(action);
BOOST_CHECK_EQUAL(action->prefix, "/test/A");
@@ -63,7 +63,7 @@
RibRouteRef rrr{entry, routeIt};
ClientToNlsrReadvertisePolicy policy;
- ndn::optional<ReadvertiseAction> action = policy.handleNewRoute(rrr);
+ optional<ReadvertiseAction> action = policy.handleNewRoute(rrr);
BOOST_CHECK(!action);
}