From 938206d66cd8da71e4b0e816f9e8444b44cdd0a8 Mon Sep 17 00:00:00 2001 From: Adam Cozzette Date: Thu, 2 Mar 2017 11:31:38 -0800 Subject: Return uint32 from Log2FloorNonZero64 A uint32 is big enough to hold any return value from that function, and doing it this way prevents compiler warnings in coded_stream.h about narrowing a uint64 to a uint32. --- src/google/protobuf/stubs/port.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/google/protobuf/stubs/port.h b/src/google/protobuf/stubs/port.h index d37e8130..6f0633c4 100644 --- a/src/google/protobuf/stubs/port.h +++ b/src/google/protobuf/stubs/port.h @@ -358,7 +358,7 @@ class Bits { #endif } - static uint64 Log2FloorNonZero64(uint64 n) { + static uint32 Log2FloorNonZero64(uint64 n) { #if defined(__GNUC__) return 63 ^ __builtin_clzll(n); #else -- cgit v1.2.3