kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix compile errors with C++ enum class

Browse Source
This commit is contained in:
Benjamin Sergeant
2019-05-15 13:56:42 -07:00
parent ccaaedf38f
commit bd4c5037c7
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/IXWebSocketCloseTest.cpp
View File

@@ -55,7 +55,7 @@ namespace
bool WebSocketClient::isReady() const bool WebSocketClient::isReady() const
{ {
return _webSocket.getReadyState() == ix::WebSocket_ReadyState_Open; return _webSocket.getReadyState() == ix::ReadyState::Open;
} }
uint16_t WebSocketClient::getCloseCode() uint16_t WebSocketClient::getCloseCode()
@@ -115,13 +115,13 @@ namespace
const ix::WebSocketCloseInfo& closeInfo) const ix::WebSocketCloseInfo& closeInfo)
{ {
std::stringstream ss; std::stringstream ss;
if (messageType == ix::WebSocket_MessageType_Open) if (messageType == ix::WebSocketMessageType::Open)
{ {
log("client connected"); log("client connected");
_webSocket.disableAutomaticReconnection(); _webSocket.disableAutomaticReconnection();
} }
else if (messageType == ix::WebSocket_MessageType_Close) else if (messageType == ix::WebSocketMessageType::Close)
{ {
log("client disconnected"); log("client disconnected");
@@ -133,24 +133,24 @@ namespace
_webSocket.disableAutomaticReconnection(); _webSocket.disableAutomaticReconnection();
} }
else if (messageType == ix::WebSocket_MessageType_Error) else if (messageType == ix::WebSocketMessageType::Error)
{ {
ss << "Error ! " << error.reason; ss << "Error ! " << error.reason;
log(ss.str()); log(ss.str());
_webSocket.disableAutomaticReconnection(); _webSocket.disableAutomaticReconnection();
} }
else if (messageType == ix::WebSocket_MessageType_Pong) else if (messageType == ix::WebSocketMessageType::Pong)
{ {
ss << "Received pong message " << str; ss << "Received pong message " << str;
log(ss.str()); log(ss.str());
} }
else if (messageType == ix::WebSocket_MessageType_Ping) else if (messageType == ix::WebSocketMessageType::Ping)
{ {
ss << "Received ping message " << str; ss << "Received ping message " << str;
log(ss.str()); log(ss.str());
} }
else if (messageType == ix::WebSocket_MessageType_Message) else if (messageType == ix::WebSocketMessageType::Message)
{ {
ss << "Received message " << str; ss << "Received message " << str;
log(ss.str()); log(ss.str());
@@ -189,7 +189,7 @@ namespace
const ix::WebSocketOpenInfo& openInfo, const ix::WebSocketOpenInfo& openInfo,
const ix::WebSocketCloseInfo& closeInfo) const ix::WebSocketCloseInfo& closeInfo)
{ {
if (messageType == ix::WebSocket_MessageType_Open) if (messageType == ix::WebSocketMessageType::Open)
{ {
Logger() << "New server connection"; Logger() << "New server connection";
Logger() << "id: " << connectionState->getId(); Logger() << "id: " << connectionState->getId();
@@ -200,7 +200,7 @@ namespace
Logger() << it.first << ": " << it.second; Logger() << it.first << ": " << it.second;
} }
} }
else if (messageType == ix::WebSocket_MessageType_Close) else if (messageType == ix::WebSocketMessageType::Close)
{ {
log("Server closed connection"); log("Server closed connection");