diff options
| author | Wim <wim@42.be> | 2019-05-30 12:20:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-30 12:20:56 +0200 |
| commit | 3418e8c9afbdf3e94ab26a20d8f12c042ae29fc4 (patch) | |
| tree | c5358b971a95749bece9469e959041d4f2e54cc3 /vendor/github.com/golang/protobuf/proto/equal.go | |
| parent | 9619dff33417548a50e51a4f75f41b9de4a73327 (diff) | |
| download | matterbridge-msglm-3418e8c9afbdf3e94ab26a20d8f12c042ae29fc4.tar.gz matterbridge-msglm-3418e8c9afbdf3e94ab26a20d8f12c042ae29fc4.tar.bz2 matterbridge-msglm-3418e8c9afbdf3e94ab26a20d8f12c042ae29fc4.zip | |
Use upstream whatsapp again (#809)
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 d4db5a1c..f9b6e41b 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. |