Skip to content

Commit

Permalink
Fix websocketpp asio warnings
Browse files Browse the repository at this point in the history
Fix taken from this comment on github:

zaphoyd/websocketpp#794 (comment)
  • Loading branch information
crowder authored and Risca committed Jan 10, 2021
1 parent 33f63b8 commit 75f8830
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 14 deletions.
5 changes: 2 additions & 3 deletions lib/websocketpp/transport/asio/connection.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ class connection : public config::socket_type::socket_con_type {
*/
timer_ptr set_timer(long duration, timer_handler callback) {
timer_ptr new_timer = lib::make_shared<lib::asio::steady_timer>(
lib::ref(*m_io_service),
*m_io_service,
lib::asio::milliseconds(duration)
);

Expand Down Expand Up @@ -461,8 +461,7 @@ class connection : public config::socket_type::socket_con_type {
m_io_service = io_service;

if (config::enable_multithreading) {
m_strand = lib::make_shared<lib::asio::io_service::strand>(
lib::ref(*io_service));
m_strand = lib::make_shared<lib::asio::io_service::strand>(*io_service);
}

lib::error_code ec = socket_con_type::init_asio(io_service, m_strand,
Expand Down
10 changes: 3 additions & 7 deletions lib/websocketpp/transport/asio/endpoint.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,7 @@ class endpoint : public config::socket_type {

m_io_service = ptr;
m_external_io_service = true;
m_acceptor = lib::make_shared<lib::asio::ip::tcp::acceptor>(
lib::ref(*m_io_service));
m_acceptor = lib::make_shared<lib::asio::ip::tcp::acceptor>(*m_io_service);

m_state = READY;
ec = lib::error_code();
Expand Down Expand Up @@ -660,9 +659,7 @@ class endpoint : public config::socket_type {
* @since 0.3.0
*/
void start_perpetual() {
m_work = lib::make_shared<lib::asio::io_service::work>(
lib::ref(*m_io_service)
);
m_work = lib::make_shared<lib::asio::io_service::work>(*m_io_service);
}

/// Clears the endpoint's perpetual flag, allowing it to exit when empty
Expand Down Expand Up @@ -826,8 +823,7 @@ class endpoint : public config::socket_type {

// Create a resolver
if (!m_resolver) {
m_resolver = lib::make_shared<lib::asio::ip::tcp::resolver>(
lib::ref(*m_io_service));
m_resolver = lib::make_shared<lib::asio::ip::tcp::resolver>(*m_io_service);
}

tcon->set_uri(u);
Expand Down
3 changes: 1 addition & 2 deletions lib/websocketpp/transport/asio/security/none.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,7 @@ class connection : public lib::enable_shared_from_this<connection> {
return socket::make_error_code(socket::error::invalid_state);
}

m_socket = lib::make_shared<lib::asio::ip::tcp::socket>(
lib::ref(*service));
m_socket = lib::make_shared<lib::asio::ip::tcp::socket>(*service);

m_state = READY;

Expand Down
3 changes: 1 addition & 2 deletions lib/websocketpp/transport/asio/security/tls.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,7 @@ class connection : public lib::enable_shared_from_this<connection> {
if (!m_context) {
return socket::make_error_code(socket::error::invalid_tls_context);
}
m_socket = lib::make_shared<socket_type>(
_WEBSOCKETPP_REF(*service),lib::ref(*m_context));
m_socket = lib::make_shared<socket_type>(_WEBSOCKETPP_REF(*service),*m_context);

m_io_service = service;
m_strand = strand;
Expand Down

0 comments on commit 75f8830

Please sign in to comment.