diff --git a/Common/3dParty/v8/v8.pri b/Common/3dParty/v8/v8.pri index 72987ec6c5..7145f08ddc 100644 --- a/Common/3dParty/v8/v8.pri +++ b/Common/3dParty/v8/v8.pri @@ -57,5 +57,4 @@ core_mac { QMAKE_CXXFLAGS += -Wall -Wno-inconsistent-missing-override QMAKE_CFLAGS += -Wall -Wno-inconsistent-missing-override - } diff --git a/Common/Network/WebSocket/src/ixwebsocket/ixwebsocket_internal.cpp b/Common/Network/WebSocket/src/ixwebsocket/ixwebsocket_internal.cpp index 6ea805af73..93fac42613 100644 --- a/Common/Network/WebSocket/src/ixwebsocket/ixwebsocket_internal.cpp +++ b/Common/Network/WebSocket/src/ixwebsocket/ixwebsocket_internal.cpp @@ -31,17 +31,11 @@ */ #include "ixwebsocket_internal.h" -#include namespace NSNetwork { namespace NSWebSocket { - CIXWebSocket::CIXWebSocket(const std::string &url, std::shared_ptr listener): CWebWorkerBase(url, listener) - { - // - } - void CIXWebSocket::open() { ix::SocketTLSOptions tls; @@ -65,14 +59,6 @@ namespace NSNetwork } else if (msg->type == ix::WebSocketMessageType::Error) { - auto errinfo = msg->errorInfo; - std::cerr << std::boolalpha - << "is decomp err " << errinfo.decompressionError << std::endl - << "http status " << errinfo.http_status << std::endl - << "reason " << errinfo.reason << std::endl - << "retries " << errinfo.retries << std::endl - << "wait time " << errinfo.wait_time << std::endl - << std::endl; CWebWorkerBase::listener->onError(msg->errorInfo.reason); } else if (msg->type == ix::WebSocketMessageType::Close) @@ -81,11 +67,6 @@ namespace NSNetwork } } - CIXWebSocket::~CIXWebSocket() - { - this->close(); - } - void CIXWebSocket::send(const std::string& message) { webSocket.send(message); @@ -95,5 +76,7 @@ namespace NSNetwork { webSocket.stop(); } + + CIXWebSocket::~CIXWebSocket() = default; } } diff --git a/Common/Network/WebSocket/src/ixwebsocket/ixwebsocket_internal.h b/Common/Network/WebSocket/src/ixwebsocket/ixwebsocket_internal.h index 3ee6400bd5..32133fdd96 100644 --- a/Common/Network/WebSocket/src/ixwebsocket/ixwebsocket_internal.h +++ b/Common/Network/WebSocket/src/ixwebsocket/ixwebsocket_internal.h @@ -48,13 +48,19 @@ namespace NSNetwork public: - CIXWebSocket(const std::string& url, std::shared_ptr listener); + CIXWebSocket(const std::string& url, std::shared_ptr listener): CWebWorkerBase(url, listener) + { + ix::initNetSystem(); + } + + public: virtual void open() override; virtual void send(const std::string& message) override; virtual void close() override; void receive(const ix::WebSocketMessagePtr& msg); virtual ~CIXWebSocket(); + }; } }