diff options
| author |  Sebastian Valle | 2017-09-30 08:22:14 -0500 |
|---|---|---|
| committer |  GitHub | 2017-09-30 08:22:14 -0500 |
| commit | a3de996ae7c41bb8d475b47dcd08abdd571cfc73 (patch) | |
| tree | 016f6866d15fb9a41a15666f492bed352d95b523 /src/network/packet.cpp | |
| parent | Merge pull request #2961 from Subv/load_titles (diff) | |
| parent | Fixed type conversion ambiguity (diff) | |
| download | yuzu-a3de996ae7c41bb8d475b47dcd08abdd571cfc73.tar.gz yuzu-a3de996ae7c41bb8d475b47dcd08abdd571cfc73.tar.xz yuzu-a3de996ae7c41bb8d475b47dcd08abdd571cfc73.zip | |
Merge pull request #2962 from huwpascoe/static_cast
Fixed type conversion ambiguity
Diffstat (limited to 'src/network/packet.cpp')
| -rw-r--r-- | src/network/packet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/packet.cpp b/src/network/packet.cpp index cc60f2fbc..7e1a812f3 100644 --- a/src/network/packet.cpp +++ b/src/network/packet.cpp | |||
| @@ -233,7 +233,7 @@ Packet& Packet::operator<<(double in_data) { | |||
| 233 | 233 | ||
| 234 | Packet& Packet::operator<<(const char* in_data) { | 234 | Packet& Packet::operator<<(const char* in_data) { |
| 235 | // First insert string length | 235 | // First insert string length |
| 236 | u32 length = std::strlen(in_data); | 236 | u32 length = static_cast<u32>(std::strlen(in_data)); |
| 237 | *this << length; | 237 | *this << length; |
| 238 | 238 | ||
| 239 | // Then insert characters | 239 | // Then insert characters |