mirror of
https://github.com/SFML/SFML.git
synced 2024-11-25 04:41:05 +08:00
Replace C++11 with SFML int types
This commit is contained in:
parent
a08cdadcb1
commit
8a8348ebeb
@ -69,7 +69,7 @@ m_valid (false)
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
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)
|
||||
{
|
||||
}
|
||||
|
@ -150,7 +150,7 @@ Packet& Packet::operator >>(Int16& data)
|
||||
if (checkSize(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);
|
||||
}
|
||||
|
||||
@ -178,7 +178,7 @@ Packet& Packet::operator >>(Int32& data)
|
||||
if (checkSize(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);
|
||||
}
|
||||
|
||||
@ -412,7 +412,7 @@ Packet& Packet::operator <<(Uint8 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));
|
||||
return *this;
|
||||
}
|
||||
@ -430,7 +430,7 @@ Packet& Packet::operator <<(Uint16 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));
|
||||
return *this;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user