Skip to content

Commit

Permalink
Workarounds for two GCC 4.7.2 bugs with lambda functions (#1209)
Browse files Browse the repository at this point in the history
* Workarounds for two GCC 4.7.2 bugs with lambda functions using implicit this, surfacing as incorrect const-qualification and an internal compiler error. Resolves immediate issues identified in #1200.

* Restore compatibility with modern compilers
  • Loading branch information
garethsb authored and BillyONeal committed Aug 2, 2019
1 parent a40a286 commit 44c4918
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Release/src/websockets/client/ws_client_wspp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ class wspp_callback_client : public websocket_client_callback_impl,

client.set_fail_handler([this](websocketpp::connection_hdl con_hdl) {
_ASSERTE(m_state == CONNECTING);
shutdown_wspp_impl<WebsocketConfigType>(con_hdl, true);
this->shutdown_wspp_impl<WebsocketConfigType>(con_hdl, true);
});

client.set_message_handler(
Expand Down Expand Up @@ -354,7 +354,7 @@ class wspp_callback_client : public websocket_client_callback_impl,

client.set_close_handler([this](websocketpp::connection_hdl con_hdl) {
_ASSERTE(m_state != CLOSED);
shutdown_wspp_impl<WebsocketConfigType>(con_hdl, false);
this->shutdown_wspp_impl<WebsocketConfigType>(con_hdl, false);
});

// Set User Agent specified by the user. This needs to happen before any connection is created
Expand Down Expand Up @@ -679,7 +679,7 @@ class wspp_callback_client : public websocket_client_callback_impl,
client.stop_perpetual();

// Can't join thread directly since it is the current thread.
pplx::create_task([this, connecting, ec, closeCode, reason] {
pplx::create_task([] {}).then([this, connecting, ec, closeCode, reason]() mutable {
{
std::lock_guard<std::mutex> lock(m_wspp_client_lock);
if (m_thread.joinable())
Expand Down

0 comments on commit 44c4918

Please sign in to comment.