aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPer Larsson <[email protected]>2022-02-22 09:05:24 +0100
committerPer Larsson <[email protected]>2022-02-22 09:05:24 +0100
commit03c2e27b24a4d4985faafef299bb21335ea817ff (patch)
treec146b21517732f93eaad7a2aa1d51a94315255e6
parentChanged log level. (diff)
downloadzen-03c2e27b24a4d4985faafef299bb21335ea817ff.tar.xz
zen-03c2e27b24a4d4985faafef299bb21335ea817ff.zip
Removed using enum statements.
-rw-r--r--zenhttp/websocketasio.cpp14
1 files changed, 5 insertions, 9 deletions
diff --git a/zenhttp/websocketasio.cpp b/zenhttp/websocketasio.cpp
index ed4f2a5b1..e9d065624 100644
--- a/zenhttp/websocketasio.cpp
+++ b/zenhttp/websocketasio.cpp
@@ -499,11 +499,9 @@ private:
WebSocketState
WsConnection::Close()
{
- using enum WebSocketState;
+ const auto PrevState = SetState(WebSocketState::kDisconnected);
- const auto PrevState = SetState(kDisconnected);
-
- if (PrevState != kDisconnected && m_Socket->is_open())
+ if (PrevState != WebSocketState::kDisconnected && m_Socket->is_open())
{
m_Socket->close();
}
@@ -794,11 +792,9 @@ WsServer::ReadMessage(std::shared_ptr<WsConnection> Connection)
return CloseConnection(Connection, ReadEc);
}
- using enum WebSocketState;
-
switch (Connection->State())
{
- case kHandshaking:
+ case WebSocketState::kHandshaking:
{
HttpMessageParser& Parser = *reinterpret_cast<HttpMessageParser*>(Connection->Parser());
asio::const_buffer Buffer = Connection->ReadBuffer().data();
@@ -920,14 +916,14 @@ WsServer::ReadMessage(std::shared_ptr<WsConnection> Connection)
Connection->RemoteAddr());
Connection->SetParser(std::make_unique<WebSocketMessageParser>());
- Connection->SetState(kConnected);
+ Connection->SetState(WebSocketState::kConnected);
ReadMessage(Connection);
});
}
break;
- case kConnected:
+ case WebSocketState::kConnected:
{
WebSocketMessageParser& Parser = *reinterpret_cast<WebSocketMessageParser*>(Connection->Parser());