diff options
| author | Joseph Richey <joerichey@google.com> | 2017-09-29 03:16:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-29 03:16:43 -0700 |
| commit | d6efd2ab463e82cc3a78860384f26d809bd76ce5 (patch) | |
| tree | f2fbf84f4e160d0d5e107ee05338be5e0133f01b /vendor/github.com/golang/protobuf/proto/encode.go | |
| parent | 3ca15548454f773ea3290f810ed1b1d55fec1783 (diff) | |
| parent | ddcc450fc6d78806a0d0369bb1cdc2155f4e328e (diff) | |
Merge pull request #64 from google/new_values
Update all external dependencies to the latest version
Diffstat (limited to 'vendor/github.com/golang/protobuf/proto/encode.go')
| -rw-r--r-- | vendor/github.com/golang/protobuf/proto/encode.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vendor/github.com/golang/protobuf/proto/encode.go b/vendor/github.com/golang/protobuf/proto/encode.go index 2b30f84..8b84d1b 100644 --- a/vendor/github.com/golang/protobuf/proto/encode.go +++ b/vendor/github.com/golang/protobuf/proto/encode.go @@ -174,11 +174,11 @@ func sizeFixed32(x uint64) int { // This is the format used for the sint64 protocol buffer type. func (p *Buffer) EncodeZigzag64(x uint64) error { // use signed number to get arithmetic right shift. - return p.EncodeVarint(uint64((x << 1) ^ uint64((int64(x) >> 63)))) + return p.EncodeVarint((x << 1) ^ uint64((int64(x) >> 63))) } func sizeZigzag64(x uint64) int { - return sizeVarint(uint64((x << 1) ^ uint64((int64(x) >> 63)))) + return sizeVarint((x << 1) ^ uint64((int64(x) >> 63))) } // EncodeZigzag32 writes a zigzag-encoded 32-bit integer |