diff options
| author | Nathan Dench <ndenc2@gmail.com> | 2019-05-24 15:16:44 +1000 |
|---|---|---|
| committer | Nathan Dench <ndenc2@gmail.com> | 2019-05-24 15:16:44 +1000 |
| commit | 107c1cdb09c575aa2f61d97f48d8587eb6bada4c (patch) | |
| tree | ca7d008643efc555c388baeaf1d986e0b6b3e28c /vendor/github.com/golang/protobuf/proto/equal.go | |
| parent | 844b5a68d8af4791755b8f0ad293cc99f5959183 (diff) | |
| download | terraform-provider-statuscake-107c1cdb09c575aa2f61d97f48d8587eb6bada4c.tar.gz terraform-provider-statuscake-107c1cdb09c575aa2f61d97f48d8587eb6bada4c.tar.zst terraform-provider-statuscake-107c1cdb09c575aa2f61d97f48d8587eb6bada4c.zip | |
Upgrade to 0.12
Diffstat (limited to 'vendor/github.com/golang/protobuf/proto/equal.go')
| -rw-r--r-- | vendor/github.com/golang/protobuf/proto/equal.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vendor/github.com/golang/protobuf/proto/equal.go b/vendor/github.com/golang/protobuf/proto/equal.go index d4db5a1..f9b6e41 100644 --- a/vendor/github.com/golang/protobuf/proto/equal.go +++ b/vendor/github.com/golang/protobuf/proto/equal.go | |||
| @@ -246,7 +246,8 @@ func equalExtMap(base reflect.Type, em1, em2 map[int32]Extension) bool { | |||
| 246 | return false | 246 | return false |
| 247 | } | 247 | } |
| 248 | 248 | ||
| 249 | m1, m2 := e1.value, e2.value | 249 | m1 := extensionAsLegacyType(e1.value) |
| 250 | m2 := extensionAsLegacyType(e2.value) | ||
| 250 | 251 | ||
| 251 | if m1 == nil && m2 == nil { | 252 | if m1 == nil && m2 == nil { |
| 252 | // Both have only encoded form. | 253 | // Both have only encoded form. |