Workarounds for two GCC 4.7.2 bugs with lambda functions using implic…

…it this, surfacing as incorrect const-qualification and an internal compiler error. Resolves immediate issues identified in microsoft#1200.
garethsb · Jul 29, 2019 · 977f2a0 · 977f2a0
1 parent a40a286
commit 977f2a0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Release/src/websockets/client/ws_client_wspp.cpp b/Release/src/websockets/client/ws_client_wspp.cpp
@@ -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(
@@ -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
@@ -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([this, connecting, ec, closeCode, reason]() mutable {
             {
                 std::lock_guard<std::mutex> lock(m_wspp_client_lock);
                 if (m_thread.joinable())