diff options
| author |  Miek Gieben <miek@miek.nl>
| 2017-08-28 17:49:28 +0200 |
|---|---|---|
| committer |  Yong Tang <yong.tang.github@outlook.com>
| 2017-08-28 08:49:28 -0700 |
| commit | 7e63bdbee8340d3ce2d2488f93d0fb1d4d16a201 (patch) | |
| tree | 2734029ca19d1a21794ffc65299c0d57254f5352 /vendor/github.com/golang/protobuf/proto | |
| parent | 558f4bea41e0493dd4b0e6d0f73b0220a39d1e67 (diff) | |
| download | coredns-7e63bdbee8340d3ce2d2488f93d0fb1d4d16a201.tar.gz coredns-7e63bdbee8340d3ce2d2488f93d0fb1d4d16a201.tar.zst coredns-7e63bdbee8340d3ce2d2488f93d0fb1d4d16a201.zip | |
dep ensure -update (#1001)
* dep ensure -update
Run "dep ensure -update` to update all dependencies.
No code changes; just the dependencies.
* dep prune
* add new venderod
Diffstat (limited to 'vendor/github.com/golang/protobuf/proto')
| -rw-r--r-- | vendor/github.com/golang/protobuf/proto/encode.go | 4 | ||||
| -rw-r--r-- | vendor/github.com/golang/protobuf/proto/text_parser.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vendor/github.com/golang/protobuf/proto/encode.go b/vendor/github.com/golang/protobuf/proto/encode.go index 2b30f8462..8b84d1b22 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 diff --git a/vendor/github.com/golang/protobuf/proto/text_parser.go b/vendor/github.com/golang/protobuf/proto/text_parser.go index 61f83c1e1..5e14513f2 100644 --- a/vendor/github.com/golang/protobuf/proto/text_parser.go +++ b/vendor/github.com/golang/protobuf/proto/text_parser.go @@ -865,7 +865,7 @@ func (p *textParser) readAny(v reflect.Value, props *Properties) error { return p.readStruct(fv, terminator) case reflect.Uint32: if x, err := strconv.ParseUint(tok.value, 0, 32); err == nil { - fv.SetUint(uint64(x)) + fv.SetUint(x) return nil } case reflect.Uint64: |