admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dcsctp: Fix iOS build errors

Browse Source 
Bug: webrtc:12614
Change-Id: Ib221688007892ab0b87ef768d20f7d779b3bfd55
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/217381
Reviewed-by: Victor Boivie <boivie@webrtc.org>
Commit-Queue: Florent Castelli <orphis@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33911}
This commit is contained in:
Florent Castelli 2021-05-04 11:31:23 +02:00 committed by WebRTC LUCI CQ
parent fe55c0b73d
commit 1e78e95de5
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/dcsctp/packet/tlv_trait.h
View File

@ -88,14 +88,15 @@ class TLVTrait {
}
BoundedByteReader<kTlvHeaderSize> tlv_header(data);
const int type = (Config::kTypeSizeInBytes == 1) ? tlv_header.Load8<0>()
: tlv_header.Load16<0>();
const int type = (Config::kTypeSizeInBytes == 1)
? tlv_header.template Load8<0>()
: tlv_header.template Load16<0>();
if (type != Config::kType) {
tlv_trait_impl::ReportInvalidType(type, Config::kType);
return absl::nullopt;
}
const uint16_t length = tlv_header.Load16<2>();
const uint16_t length = tlv_header.template Load16<2>();
if (Config::kVariableLengthAlignment == 0) {
// Don't expect any variable length data at all.
if (length != Config::kHeaderSize || data.size() != Config::kHeaderSize) {
@ -138,11 +139,11 @@ class TLVTrait {
BoundedByteWriter<kTlvHeaderSize> tlv_header(
rtc::ArrayView<uint8_t>(out.data() + offset, kTlvHeaderSize));
if (Config::kTypeSizeInBytes == 1) {
tlv_header.Store8<0>(static_cast<uint8_t>(Config::kType));
tlv_header.template Store8<0>(static_cast<uint8_t>(Config::kType));
} else {
tlv_header.Store16<0>(Config::kType);
tlv_header.template Store16<0>(Config::kType);
}
tlv_header.Store16<2>(size);
tlv_header.template Store16<2>(size);
return BoundedByteWriter<Config::kHeaderSize>(
rtc::ArrayView<uint8_t>(out.data() + offset, size));