commit fe4471b2a5f6aed7133fa9e8bbf197f8f92ef364
author haoyuewang <haoyuewang@google.com> Wed Feb 02 15:17:54 2022 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Feb 02 15:19:47 2022 -0800
tree 3a37265b7f25416ee592098aa8646790f9e5cb65
parent b66ecdb96d511faaab934efa7229e8e0b47e78fc

Use std::min<uint64_t> (instead of std::min<uint32_t>) when one of its arguments is the size of std::vector to unblock quiche merge due to error:

../../net/third_party/quiche/src/quic/core/quic_framer.h:1117:59: error: implicit conversion loses integer precision: 'std::vector<std::pair<quic::QuicPacketNumber, quic::QuicTime>>::size_type' (aka 'unsigned long') to 'const unsigned int' [-Werror,-Wshorten-64-to-32]
frame.received_packet_times.size()) > 0;

PiperOrigin-RevId: 425990220

quic/core/quic_framer.h

diff --git a/quic/core/quic_framer.h b/quic/core/quic_framer.h
index a238f07..d4d939c 100644
--- a/quic/core/quic_framer.h
+++ b/quic/core/quic_framer.h
@@ -1113,7 +1113,7 @@
   bool UseIetfAckWithReceiveTimestamp(const QuicAckFrame& frame) const {
     return VersionHasIetfQuicFrames(version_.transport_version) &&
            process_timestamps_ &&
-           std::min<uint32_t>(max_receive_timestamps_per_ack_,
+           std::min<uint64_t>(max_receive_timestamps_per_ack_,
                               frame.received_packet_times.size()) > 0;
   }