academy/mq-container
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade to Go 1.18 and re-vendor dependencies

Browse Source
This commit is contained in:
arthur.barr@uk.ibm.com
2023-01-26 16:40:47 +00:00
committed by Arthur Barr
parent f2842d7eee
commit 5c4422badf
448 changed files with 32933 additions and 20696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vendor/google.golang.org/protobuf/internal/impl/merge.go generated vendored
View File

@@ -77,9 +77,9 @@ func (mi *MessageInfo) mergePointer(dst, src pointer, opts mergeOptions) {
}
}
if mi.unknownOffset.IsValid() {
du := dst.Apply(mi.unknownOffset).Bytes()
su := src.Apply(mi.unknownOffset).Bytes()
if len(*su) > 0 {
su := mi.getUnknownBytes(src)
if su != nil && len(*su) > 0 {
du := mi.mutableUnknownBytes(dst)
*du = append(*du, *su...)
}
}