core+daemon: eliminate scheduler::{schedule,cancel} wrappers
Also move core/global-io.hpp to daemon/global.hpp
Refs: #4528, #4883
Change-Id: I0b99029f1a19d7451aab57099cd3303b7eb42ff3
diff --git a/tools/ndn-autoconfig/main.cpp b/tools/ndn-autoconfig/main.cpp
index dd7bec6..e69ef89 100644
--- a/tools/ndn-autoconfig/main.cpp
+++ b/tools/ndn-autoconfig/main.cpp
@@ -24,7 +24,6 @@
*/
#include "procedure.hpp"
-#include "core/scheduler.hpp"
#include "core/version.hpp"
#include <signal.h>
@@ -88,10 +87,10 @@
proc.getIoService().stop();
});
- util::Scheduler sched(proc.getIoService());
- util::scheduler::ScopedEventId runEvt;
+ Scheduler sched(proc.getIoService());
+ scheduler::ScopedEventId runEvt;
auto scheduleRerun = [&] (time::nanoseconds delay) {
- runEvt = sched.scheduleEvent(delay, [&] { proc.runOnce(); });
+ runEvt = sched.schedule(delay, [&] { proc.runOnce(); });
};
proc.onComplete.connect([&] (bool isSuccess) {