vendor: update github.com/gogo/protobuf and github.com/golang/protobuf

This commit is contained in:
Anthony Romano
2017-06-12 14:12:37 -07:00
parent 933aa09b73
commit 2afd0a726f
28 changed files with 1975 additions and 135 deletions

View File

@ -1075,10 +1075,17 @@ func (o *Buffer) enc_map(p *Properties, base structPointer) error {
func (o *Buffer) enc_exts(p *Properties, base structPointer) error {
exts := structPointer_Extensions(base, p.field)
if err := encodeExtensions(exts); err != nil {
v, mu := exts.extensionsRead()
if v == nil {
return nil
}
mu.Lock()
defer mu.Unlock()
if err := encodeExtensionsMap(v); err != nil {
return err
}
v, _ := exts.extensionsRead()
return o.enc_map_body(v)
}