From 939eb80ed0a563a2cd52516e254b4423b92c6413 Mon Sep 17 00:00:00 2001 From: Wez Date: Thu, 3 May 2018 03:34:17 -0700 Subject: [PATCH] Add missing casts-to-int to int/uint16 comparisons. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These are required to avoid compilation errors due to signed/unsigned comparison, on some toolchains (specifically Clang/Fuchsia). Bug: chromium:839351 Change-Id: I52e726acd4e8d6744e98d7583bc82fcec81060d9 Reviewed-on: https://webrtc-review.googlesource.com/74100 Commit-Queue: Wez Reviewed-by: Tommi Reviewed-by: Henrik Boström Cr-Commit-Position: refs/heads/master@{#23109} --- media/base/rtputils.cc | 2 +- pc/peerconnection.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media/base/rtputils.cc b/media/base/rtputils.cc index e8fd10d8bb..96828052f3 100644 --- a/media/base/rtputils.cc +++ b/media/base/rtputils.cc @@ -257,7 +257,7 @@ bool SetRtpSsrc(void* data, size_t len, uint32_t value) { // Assumes version 2, no padding, no extensions, no csrcs. bool SetRtpHeader(void* data, size_t len, const RtpHeader& header) { if (!IsValidRtpPayloadType(header.payload_type) || - header.seq_num < 0 || header.seq_num > UINT16_MAX) { + header.seq_num < 0 || header.seq_num > static_cast(UINT16_MAX)) { return false; } return (SetUint8(data, kRtpFlagsOffset, kRtpVersion << 6) && diff --git a/pc/peerconnection.cc b/pc/peerconnection.cc index 572816c218..454746f40e 100644 --- a/pc/peerconnection.cc +++ b/pc/peerconnection.cc @@ -2865,7 +2865,7 @@ bool PeerConnection::SetConfiguration(const RTCConfiguration& configuration, // Note that this isn't possible through chromium, since it's an unsigned // short in WebIDL. if (configuration.ice_candidate_pool_size < 0 || - configuration.ice_candidate_pool_size > UINT16_MAX) { + configuration.ice_candidate_pool_size > static_cast(UINT16_MAX)) { return SafeSetError(RTCErrorType::INVALID_RANGE, error); }