summaryrefslogtreecommitdiff
path: root/src/network/packet.cpp
diff options
context:
space:
mode:
authorSebastian Valle <subv2112@gmail.com>2017-09-30 08:22:14 -0500
committerGitHub <noreply@github.com>2017-09-30 08:22:14 -0500
commita3de996ae7c41bb8d475b47dcd08abdd571cfc73 (patch)
tree016f6866d15fb9a41a15666f492bed352d95b523 /src/network/packet.cpp
parentb07af7dda822898e9c8f231c5ddcd1741d93dbef (diff)
parenta13ab958cbba75bc9abd1ca50f3030a10a75784e (diff)
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.cpp2
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) {
Packet& Packet::operator<<(const char* in_data) {
// First insert string length
- u32 length = std::strlen(in_data);
+ u32 length = static_cast<u32>(std::strlen(in_data));
*this << length;
// Then insert characters