diff options
| author |  Adam Cozzette <acozzette@gmail.com> | 2017-03-03 07:06:15 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-03-03 07:06:15 -0800 |
| commit | 008ff033ef3308512c1da2b7cdadf50a6296251a (patch) | |
| tree | bfe600ea30245c73f87733ff29c50fb5858de5f0 | |
| parent | 8610d0a9dde9fe536f8c5cd6702e25bd8d9bd1f3 (diff) | |
| parent | 938206d66cd8da71e4b0e816f9e8444b44cdd0a8 (diff) | |
Merge pull request #2784 from acozzette/log-2-floor-int
Return uint32 from Log2FloorNonZero64
| -rw-r--r-- | src/google/protobuf/stubs/port.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 |