diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2018-08-28 02:53:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-28 02:53:05 +0200 |
| commit | 2033d660d238d9f8f3c4af5acca3a1fec10ac57c (patch) | |
| tree | 25d954a5bb8ff27eb230a3f20c02d36843d6773b /Source/Core/Common/SFMLHelper.cpp | |
| parent | df93bb8e76ebf6ef4fd1d52352551f7da348896d (diff) | |
| parent | d10a0b440f01825d211f513157efaf33afcc1a33 (diff) | |
Merge pull request #7376 from lioncash/sfml
Externals: Update SFML to 2.5.0
Diffstat (limited to 'Source/Core/Common/SFMLHelper.cpp')
| -rw-r--r-- | Source/Core/Common/SFMLHelper.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Source/Core/Common/SFMLHelper.cpp b/Source/Core/Common/SFMLHelper.cpp index 367bd93a9e..46b8ce836b 100644 --- a/Source/Core/Common/SFMLHelper.cpp +++ b/Source/Core/Common/SFMLHelper.cpp @@ -26,13 +26,8 @@ u32 PacketReadU32(sf::Packet& packet) u64 PacketReadU64(sf::Packet& packet) { - u32 low, high; - packet >> low >> high; - return low | (static_cast<u64>(high) << 32); -} - -void PacketWriteU64(sf::Packet& packet, const u64 value) -{ - packet << static_cast<u32>(value) << static_cast<u32>(value >> 32); + sf::Uint64 value; + packet >> value; + return value; } } // namespace Common |
