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

Return uint32 from Log2FloorNonZero64

Merge pull request #2784 from acozzette/log-2-floor-int
Return uint32 from Log2FloorNonZero64
008ff033 · Adam Cozzette · GitHub · 8610d0a9 · 938206d6 · 008ff033
Commit 008ff033 authored Mar 03, 2017 by Adam Cozzette Committed by GitHub Mar 03, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

port.h src/google/protobuf/stubs/port.h +1 -1

No files found.
--- 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