35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
From ee2c63c89e6e3f5a14e09a9c7edaaf6774190ce6 Mon Sep 17 00:00:00 2001
|
|
From: Brian Heim <brianlheim@gmail.com>
|
|
Date: Thu, 19 Sep 2019 20:54:52 -0500
|
|
Subject: [PATCH] Update for boost 1.70
|
|
|
|
---
|
|
server/supernova/sc/sc_osc_handler.cpp | 2 +-
|
|
server/supernova/utilities/utils.hpp | 1 +
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/server/supernova/sc/sc_osc_handler.cpp b/server/supernova/sc/sc_osc_handler.cpp
|
|
index 33d907a3df..bf307fc13b 100644
|
|
--- server/supernova/sc/sc_osc_handler.cpp
|
|
+++ server/supernova/sc/sc_osc_handler.cpp
|
|
@@ -734,7 +734,7 @@ void sc_osc_handler::tcp_connection::handle_message() {
|
|
|
|
|
|
void sc_osc_handler::start_tcp_accept(void) {
|
|
- tcp_connection::pointer new_connection = tcp_connection::create(tcp_acceptor_.get_io_service());
|
|
+ tcp_connection::pointer new_connection = tcp_connection::create(tcp_acceptor_.get_executor().context());
|
|
|
|
tcp_acceptor_.async_accept(
|
|
new_connection->socket(),
|
|
diff --git a/server/supernova/utilities/utils.hpp b/server/supernova/utilities/utils.hpp
|
|
index 35b8ab5ada..a7c191f2db 100644
|
|
--- server/supernova/utilities/utils.hpp
|
|
+++ server/supernova/utilities/utils.hpp
|
|
@@ -23,6 +23,7 @@
|
|
|
|
#include <type_traits>
|
|
|
|
+#include <boost/checked_delete.hpp>
|
|
#include <boost/intrusive_ptr.hpp>
|
|
#include <boost/noncopyable.hpp>
|
|
#include <boost/detail/atomic_count.hpp>
|