diff options
author | Erwin Jansen <jansene@google.com> | 2021-06-30 07:29:26 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-06-30 07:29:26 +0000 |
commit | 059cdc5996938f5f6b5343b6c969c12098275587 (patch) | |
tree | 6eacaffe4bebf8e00c290c1e1839e084b0c52e88 /net/dcsctp/packet/chunk_validators.cc | |
parent | 97e54a7e73c7b24e464ef06ef3c3b3716f21bb15 (diff) | |
parent | 16be34ae72cdb525c88c2b31b21b976f35fe36d8 (diff) | |
download | webrtc-059cdc5996938f5f6b5343b6c969c12098275587.tar.gz |
Merge "Merge upstream-master and enable ARM64" into emu-master-devemu-31-stable-releaseemu-31-release
Diffstat (limited to 'net/dcsctp/packet/chunk_validators.cc')
-rw-r--r-- | net/dcsctp/packet/chunk_validators.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/dcsctp/packet/chunk_validators.cc b/net/dcsctp/packet/chunk_validators.cc index b3467037c7..48d351827e 100644 --- a/net/dcsctp/packet/chunk_validators.cc +++ b/net/dcsctp/packet/chunk_validators.cc @@ -38,9 +38,7 @@ SackChunk ChunkValidators::Clean(SackChunk&& sack) { // Not more than at most one remaining? Exit early. if (gap_ack_blocks.size() <= 1) { return SackChunk(sack.cumulative_tsn_ack(), sack.a_rwnd(), - std::move(gap_ack_blocks), - std::vector<TSN>(sack.duplicate_tsns().begin(), - sack.duplicate_tsns().end())); + std::move(gap_ack_blocks), sack.duplicate_tsns()); } // Sort the intervals by their start value, to aid in the merging below. @@ -63,8 +61,7 @@ SackChunk ChunkValidators::Clean(SackChunk&& sack) { } return SackChunk(sack.cumulative_tsn_ack(), sack.a_rwnd(), std::move(merged), - std::vector<TSN>(sack.duplicate_tsns().begin(), - sack.duplicate_tsns().end())); + sack.duplicate_tsns()); } bool ChunkValidators::Validate(const SackChunk& sack) { |