diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-24 16:52:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-24 16:52:02 +0200 |
| commit | 72260a296c534950d9c899ee907e73b5dd0162f0 (patch) | |
| tree | d9b33042a70c2d1e600c75855a29b3aa594aaab6 /vendor/github.com/golang/protobuf/proto/equal.go | |
| parent | cf244d87cdb9b2cb0d8510b2ea392d928c1eb269 (diff) | |
| parent | d697456dc90adbaf68224ed7c115b38d5855e582 (diff) | |
| download | podman-72260a296c534950d9c899ee907e73b5dd0162f0.tar.gz podman-72260a296c534950d9c899ee907e73b5dd0162f0.tar.bz2 podman-72260a296c534950d9c899ee907e73b5dd0162f0.zip | |
Merge pull request #3414 from vrothberg/go-modules
Go modules
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 d4db5a1c1..f9b6e41b3 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 { return false } - m1, m2 := e1.value, e2.value + m1 := extensionAsLegacyType(e1.value) + m2 := extensionAsLegacyType(e2.value) if m1 == nil && m2 == nil { // Both have only encoded form. |