util: add ndn::scheduler namespace alias
This is the new preferred way to refer to Scheduler and related
classes. The Scheduler class itself is also available as ndn::Scheduler
like before. ndn::util::Scheduler and ndn::EventId are deprecated.
Refs: #4883
Change-Id: I825c2a0911a959caa60d7d8a547ca7199c58f61e
diff --git a/tests/integrated/face.cpp b/tests/integrated/face.cpp
index 99d5a20..5798b0f 100644
--- a/tests/integrated/face.cpp
+++ b/tests/integrated/face.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2019 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -79,7 +79,7 @@
* \param[out] outcome the response, initially '?', 'D' for Data, 'N' for Nack, 'T' for timeout
* \return scheduled event id
*/
- EventId
+ scheduler::EventId
sendInterest(time::nanoseconds delay, const Interest& interest, char& outcome)
{
if (face2 == nullptr) {
@@ -95,7 +95,7 @@
});
}
- EventId
+ scheduler::EventId
sendInterest(time::nanoseconds delay, const Interest& interest)
{
static char ignoredOutcome;
@@ -105,7 +105,7 @@
/** \brief Stop io_service after a delay
* \return scheduled event id
*/
- EventId
+ scheduler::EventId
terminateAfter(time::nanoseconds delay)
{
return sched.scheduleEvent(delay, [this] { face.getIoService().stop(); });
@@ -114,7 +114,6 @@
protected:
Face face;
Scheduler sched;
-
unique_ptr<Face> face2;
};