diff options
| author | Wim <wim@42.be> | 2023-08-05 20:43:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-05 20:43:19 +0200 |
| commit | 56e7bd01ca09ad52b0c4f48f146a20a4f1b78696 (patch) | |
| tree | b1355645342667209263cbd355dc0b4254f1e8fe /vendor/google.golang.org/protobuf/internal/order | |
| parent | 9459495484d6e06a3d46de64fccd8d06f7ccc72c (diff) | |
| download | matterbridge-msglm-master.tar.gz matterbridge-msglm-master.tar.bz2 matterbridge-msglm-master.zip | |
Diffstat (limited to 'vendor/google.golang.org/protobuf/internal/order')
| -rw-r--r-- | vendor/google.golang.org/protobuf/internal/order/order.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/google.golang.org/protobuf/internal/order/order.go b/vendor/google.golang.org/protobuf/internal/order/order.go index 33745ed0..dea522e1 100644 --- a/vendor/google.golang.org/protobuf/internal/order/order.go +++ b/vendor/google.golang.org/protobuf/internal/order/order.go @@ -33,7 +33,7 @@ var ( return !inOneof(ox) && inOneof(oy) } // Fields in disjoint oneof sets are sorted by declaration index. - if ox != nil && oy != nil && ox != oy { + if inOneof(ox) && inOneof(oy) && ox != oy { return ox.Index() < oy.Index() } // Fields sorted by field number. |