Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace C++11 with SFML int types

Browse Source
This commit is contained in:
Lukas Dürrenberger 2023-06-20 00:04:11 +02:00
parent a08cdadcb1
commit 8a8348ebeb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SFML/Network/IpAddress.cpp
View File

@ -69,7 +69,7 @@ m_valid (false)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
IpAddress::IpAddress(Uint8 byte0, Uint8 byte1, Uint8 byte2, Uint8 byte3) : IpAddress::IpAddress(Uint8 byte0, Uint8 byte1, Uint8 byte2, Uint8 byte3) :
m_address(htonl(static_cast<uint32_t>((byte0 << 24) | (byte1 << 16) | (byte2 << 8) | byte3))), m_address(htonl(static_cast<Uint32>((byte0 << 24) | (byte1 << 16) | (byte2 << 8) | byte3))),
m_valid (true) m_valid (true)
{ {
} }

8
src/SFML/Network/Packet.cpp
View File

@ -150,7 +150,7 @@ Packet& Packet::operator >>(Int16& data)
if (checkSize(sizeof(data))) if (checkSize(sizeof(data)))
{ {
std::memcpy(&data, &m_data[m_readPos], sizeof(data)); std::memcpy(&data, &m_data[m_readPos], sizeof(data));
data = static_cast<Int16>(ntohs(static_cast<uint16_t>(data))); data = static_cast<Int16>(ntohs(static_cast<Uint16>(data)));
m_readPos += sizeof(data); m_readPos += sizeof(data);
} }
@ -178,7 +178,7 @@ Packet& Packet::operator >>(Int32& data)
if (checkSize(sizeof(data))) if (checkSize(sizeof(data)))
{ {
std::memcpy(&data, &m_data[m_readPos], sizeof(data)); std::memcpy(&data, &m_data[m_readPos], sizeof(data));
data = static_cast<Int32>(ntohl(static_cast<uint32_t>(data))); data = static_cast<Int32>(ntohl(static_cast<Uint32>(data)));
m_readPos += sizeof(data); m_readPos += sizeof(data);
} }
@ -412,7 +412,7 @@ Packet& Packet::operator <<(Uint8 data)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Packet& Packet::operator <<(Int16 data) Packet& Packet::operator <<(Int16 data)
{ {
Int16 toWrite = static_cast<Int16>(htons(static_cast<uint16_t>(data))); Int16 toWrite = static_cast<Int16>(htons(static_cast<Uint16>(data)));
append(&toWrite, sizeof(toWrite)); append(&toWrite, sizeof(toWrite));
return *this; return *this;
} }
@ -430,7 +430,7 @@ Packet& Packet::operator <<(Uint16 data)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Packet& Packet::operator <<(Int32 data) Packet& Packet::operator <<(Int32 data)
{ {
Int32 toWrite = static_cast<Int32>(htonl(static_cast<uint32_t>(data))); Int32 toWrite = static_cast<Int32>(htonl(static_cast<Uint32>(data)));
append(&toWrite, sizeof(toWrite)); append(&toWrite, sizeof(toWrite));
return *this; return *this;
} }