sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert all remaining enums to enum classes (!)

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-05-25 00:08:50 +02:00
parent 8cdd0b51cb
commit 874fb3542e
122 changed files with 1082 additions and 2169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Nazara/Network/AbstractSocket.cpp
View File

@@ -3,6 +3,7 @@
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Network/AbstractSocket.hpp>
#include <Nazara/Core/Algorithm.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Core/StringExt.hpp>
#include <Nazara/Network/Algorithm.hpp>
@@ -32,9 +33,9 @@ namespace Nz
*/
AbstractSocket::AbstractSocket(SocketType type) :
m_lastError(SocketError_NoError),
m_lastError(SocketError::NoError),
m_handle(SocketImpl::InvalidHandle),
m_state(SocketState_NotConnected),
m_state(SocketState::NotConnected),
m_type(type),
m_isBlockingEnabled(true)
{
@@ -165,7 +166,7 @@ namespace Nz
void AbstractSocket::OnClose()
{
UpdateState(SocketState_NotConnected);
UpdateState(SocketState::NotConnected);
}
/*!
@@ -178,7 +179,7 @@ namespace Nz
{
SocketError errorCode;
if (!SocketImpl::SetBlocking(m_handle, m_isBlockingEnabled, &errorCode))
NazaraWarning("Failed to set socket blocking mode (0x" + NumberToString(errorCode, 16) + ')');
NazaraWarning("Failed to set socket blocking mode (0x" + NumberToString(UnderlyingCast(errorCode), 16) + ')');
}
/*!
@@ -190,11 +191,11 @@ namespace Nz
{
if (m_handle == SocketImpl::InvalidHandle || m_protocol != protocol)
{
SocketHandle handle = SocketImpl::Create((protocol == NetProtocol_Any) ? NetProtocol_IPv6 : protocol, m_type, &m_lastError);
SocketHandle handle = SocketImpl::Create((protocol == NetProtocol::Any) ? NetProtocol::IPv6 : protocol, m_type, &m_lastError);
if (handle == SocketImpl::InvalidHandle)
return false;
if (protocol == NetProtocol_Any)
if (protocol == NetProtocol::Any)
{
if (!SocketImpl::SetIPv6Only(handle, false, &m_lastError))
{
@@ -204,7 +205,7 @@ namespace Nz
return false;
}
protocol = NetProtocol_IPv6;
protocol = NetProtocol::IPv6;
}
m_protocol = protocol;