summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/dcpomatic_socket.cc12
-rw-r--r--src/lib/dcpomatic_socket.h4
2 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/dcpomatic_socket.cc b/src/lib/dcpomatic_socket.cc
index 33182e4a9..b795811e4 100644
--- a/src/lib/dcpomatic_socket.cc
+++ b/src/lib/dcpomatic_socket.cc
@@ -43,16 +43,16 @@ Socket::Socket (int timeout)
, _socket(_io_context)
, _timeout (timeout)
{
- _deadline.expires_at (boost::posix_time::pos_infin);
- check ();
+ _deadline.expires_at(std::chrono::time_point<std::chrono::system_clock>::max());
+ check();
}
void
Socket::check ()
{
- if (_deadline.expires_at() <= boost::asio::deadline_timer::traits_type::now ()) {
- _socket.close ();
- _deadline.expires_at (boost::posix_time::pos_infin);
+ if (_deadline.expires_at() <= std::chrono::system_clock::now()) {
+ _socket.close();
+ _deadline.expires_at(std::chrono::time_point<std::chrono::system_clock>::max());
}
_deadline.async_wait (boost::bind (&Socket::check, this));
@@ -321,7 +321,7 @@ Socket::set_send_buffer_size (int size)
void
Socket::set_deadline_from_now(int seconds)
{
- _deadline.expires_from_now(boost::posix_time::seconds(seconds));
+ _deadline.expires_from_now(std::chrono::seconds(seconds));
}
void
diff --git a/src/lib/dcpomatic_socket.h b/src/lib/dcpomatic_socket.h
index 7accf737a..6a7074660 100644
--- a/src/lib/dcpomatic_socket.h
+++ b/src/lib/dcpomatic_socket.h
@@ -22,7 +22,7 @@
#include "digester.h"
#include "io_context.h"
#include <boost/asio.hpp>
-#include <boost/asio/deadline_timer.hpp>
+#include <boost/asio/system_timer.hpp>
#include <boost/scoped_ptr.hpp>
@@ -102,7 +102,7 @@ private:
#endif
dcpomatic::io_context _io_context;
- boost::asio::deadline_timer _deadline;
+ boost::asio::system_timer _deadline;
boost::asio::ip::tcp::socket _socket;
int _timeout;
boost::scoped_ptr<Digester> _read_digester;