From 5af3096070f09017f3eff73e972b75b9de843dd8 Mon Sep 17 00:00:00 2001 From: Benjamin Sergeant Date: Wed, 15 May 2019 13:56:42 -0700 Subject: [PATCH] fix compile errors with C++ enum class --- test/IXWebSocketCloseTest.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test/IXWebSocketCloseTest.cpp b/test/IXWebSocketCloseTest.cpp index 219463e1..1764b78a 100644 --- a/test/IXWebSocketCloseTest.cpp +++ b/test/IXWebSocketCloseTest.cpp @@ -55,7 +55,7 @@ namespace bool WebSocketClient::isReady() const { - return _webSocket.getReadyState() == ix::WebSocket_ReadyState_Open; + return _webSocket.getReadyState() == ix::ReadyState::Open; } uint16_t WebSocketClient::getCloseCode() @@ -115,13 +115,13 @@ namespace const ix::WebSocketCloseInfo& closeInfo) { std::stringstream ss; - if (messageType == ix::WebSocket_MessageType_Open) + if (messageType == ix::WebSocketMessageType::Open) { log("client connected"); _webSocket.disableAutomaticReconnection(); } - else if (messageType == ix::WebSocket_MessageType_Close) + else if (messageType == ix::WebSocketMessageType::Close) { log("client disconnected"); @@ -133,24 +133,24 @@ namespace _webSocket.disableAutomaticReconnection(); } - else if (messageType == ix::WebSocket_MessageType_Error) + else if (messageType == ix::WebSocketMessageType::Error) { ss << "Error ! " << error.reason; log(ss.str()); _webSocket.disableAutomaticReconnection(); } - else if (messageType == ix::WebSocket_MessageType_Pong) + else if (messageType == ix::WebSocketMessageType::Pong) { ss << "Received pong message " << str; log(ss.str()); } - else if (messageType == ix::WebSocket_MessageType_Ping) + else if (messageType == ix::WebSocketMessageType::Ping) { ss << "Received ping message " << str; log(ss.str()); } - else if (messageType == ix::WebSocket_MessageType_Message) + else if (messageType == ix::WebSocketMessageType::Message) { ss << "Received message " << str; log(ss.str()); @@ -189,7 +189,7 @@ namespace const ix::WebSocketOpenInfo& openInfo, const ix::WebSocketCloseInfo& closeInfo) { - if (messageType == ix::WebSocket_MessageType_Open) + if (messageType == ix::WebSocketMessageType::Open) { Logger() << "New server connection"; Logger() << "id: " << connectionState->getId(); @@ -200,7 +200,7 @@ namespace Logger() << it.first << ": " << it.second; } } - else if (messageType == ix::WebSocket_MessageType_Close) + else if (messageType == ix::WebSocketMessageType::Close) { log("Server closed connection");