core: drop std::function and ndn::Exclude from common.hpp, add ndn::optional
Change-Id: Ie3983d8b6f9929430efd8ada8d942e3f95755cd4
diff --git a/tools/nfdc/rib-module.hpp b/tools/nfdc/rib-module.hpp
index ae53928..6c64cd2 100644
--- a/tools/nfdc/rib-module.hpp
+++ b/tools/nfdc/rib-module.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-2018, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -69,7 +69,7 @@
void
fetchStatus(Controller& controller,
- const function<void()>& onSuccess,
+ const std::function<void()>& onSuccess,
const Controller::DatasetFailCallback& onFailure,
const CommandOptions& options) override;
@@ -80,7 +80,7 @@
formatStatusText(std::ostream& os) const override;
private:
- using RoutePredicate = function<bool(const RibEntry&, const Route&)>;
+ using RoutePredicate = std::function<bool(const RibEntry&, const Route&)>;
static void
listRoutesImpl(ExecuteContext& ctx, const RoutePredicate& filter);