From 99bf1af4b2664a07289bd26493ab19d7c7fe4dbe Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Wed, 2 Jul 2014 15:48:13 +1000 Subject: [PATCH] guid: ensure unsigned maths for shifting --- guid.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/guid.cpp b/guid.cpp index 9964f286..94a05fb2 100644 --- a/guid.cpp +++ b/guid.cpp @@ -190,14 +190,14 @@ operator>> (std::istream &is, guid &g) { >> data4_a >> dash4a >> data4_b; - uint64_t data4 = data4_b | (uint64_t)data4_a << 48; - g.data4[0] = data4 & 0xFF; data4 >>= 8; - g.data4[1] = data4 & 0xFF; data4 >>= 8; - g.data4[2] = data4 & 0xFF; data4 >>= 8; - g.data4[3] = data4 & 0xFF; data4 >>= 8; - g.data4[4] = data4 & 0xFF; data4 >>= 8; - g.data4[5] = data4 & 0xFF; data4 >>= 8; - g.data4[6] = data4 & 0xFF; data4 >>= 8; + uint64_t data4 = data4_b | static_cast (data4_a) << 48u; + g.data4[0] = data4 & 0xFF; data4 >>= 8u; + g.data4[1] = data4 & 0xFF; data4 >>= 8u; + g.data4[2] = data4 & 0xFF; data4 >>= 8u; + g.data4[3] = data4 & 0xFF; data4 >>= 8u; + g.data4[4] = data4 & 0xFF; data4 >>= 8u; + g.data4[5] = data4 & 0xFF; data4 >>= 8u; + g.data4[6] = data4 & 0xFF; data4 >>= 8u; g.data4[7] = data4 & 0xFF; if (braces)