Merge pull request #2784 from acozzette/log-2-floor-int

Return uint32 from Log2FloorNonZero64
8 years ago · 008ff033ef
parent 8610d0a9dd 938206d66c
commit 008ff033ef
1 changed files with 1 additions and 1 deletions
--- 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