summaryrefslogtreecommitdiffstats
path: root/src/lib/asiolink/interval_timer.cc
diff options
context:
space:
mode:
authorFrancis Dupont <fdupont@isc.org>2020-07-31 00:04:26 +0200
committerTomek Mrugalski <tomek@isc.org>2020-08-13 15:54:14 +0200
commit2035f64c1c0d0908c71b47a0c321ed66784e391c (patch)
treeb9f69a38a572cb7afe2763143fc5c877b218ebad /src/lib/asiolink/interval_timer.cc
parent[#285] Corrected changelog numbering (diff)
downloadkea-2035f64c1c0d0908c71b47a0c321ed66784e391c.tar.xz
kea-2035f64c1c0d0908c71b47a0c321ed66784e391c.zip
[#1308] Got rid of boost function/bind
Diffstat (limited to 'src/lib/asiolink/interval_timer.cc')
-rw-r--r--src/lib/asiolink/interval_timer.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/asiolink/interval_timer.cc b/src/lib/asiolink/interval_timer.cc
index 5a3061e688..b74901969e 100644
--- a/src/lib/asiolink/interval_timer.cc
+++ b/src/lib/asiolink/interval_timer.cc
@@ -9,7 +9,6 @@
#include <asiolink/interval_timer.h>
#include <asiolink/io_service.h>
-#include <boost/bind.hpp>
#include <boost/enable_shared_from_this.hpp>
#include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp>
@@ -17,6 +16,7 @@
#include <exceptions/exceptions.h>
#include <atomic>
+#include <functional>
#include <mutex>
using namespace std;
@@ -118,7 +118,7 @@ IntervalTimerImpl::setup(const IntervalTimer::Callback& cbfunc,
"equal to 0");
}
// Call back function should not be empty.
- if (cbfunc.empty()) {
+ if (!cbfunc) {
isc_throw(isc::InvalidParameter, "Callback function is empty");
}
@@ -140,9 +140,9 @@ IntervalTimerImpl::update() {
timer_.expires_from_now(boost::posix_time::millisec(long(interval_)));
// Reset timer.
// Pass a function bound with a shared_ptr to this.
- timer_.async_wait(boost::bind(&IntervalTimerImpl::callback,
- shared_from_this(),
- boost::asio::placeholders::error));
+ timer_.async_wait(std::bind(&IntervalTimerImpl::callback,
+ shared_from_this(),
+ std::placeholders::_1)); //error
} catch (const boost::system::system_error& e) {
isc_throw(isc::Unexpected, "Failed to update timer: " << e.what());
} catch (const boost::bad_weak_ptr&) {