Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(187)

Unified Diff: net/quic/core/congestion_control/tcp_cubic_sender_base.cc

Issue 2524523002: Remove various 'using std::' statements from QUIC code and use (Closed)
Patch Set: Rebase Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/quic/core/congestion_control/tcp_cubic_sender_base.cc
diff --git a/net/quic/core/congestion_control/tcp_cubic_sender_base.cc b/net/quic/core/congestion_control/tcp_cubic_sender_base.cc
index b545d68073ed25a29ad9d4ae2aff77222b0e71a3..3a74855e90427e7e345b64de03c3ccff33692e4c 100644
--- a/net/quic/core/congestion_control/tcp_cubic_sender_base.cc
+++ b/net/quic/core/congestion_control/tcp_cubic_sender_base.cc
@@ -15,8 +15,6 @@
#include "net/quic/core/quic_bug_tracker.h"
#include "net/quic/core/quic_flags.h"
-using std::max;
-using std::min;
namespace net {
@@ -115,7 +113,7 @@ void TcpCubicSenderBase::ResumeConnectionState(
}
void TcpCubicSenderBase::SetNumEmulatedConnections(int num_connections) {
- num_connections_ = max(1, num_connections);
+ num_connections_ = std::max(1, num_connections);
}
float TcpCubicSenderBase::RenoBeta() const {
@@ -152,7 +150,7 @@ void TcpCubicSenderBase::OnPacketAcked(QuicPacketNumber acked_packet_number,
QuicByteCount acked_bytes,
QuicByteCount prior_in_flight) {
largest_acked_packet_number_ =
- max(acked_packet_number, largest_acked_packet_number_);
+ std::max(acked_packet_number, largest_acked_packet_number_);
if (InRecovery()) {
if (!no_prr_) {
// PRR is used when in recovery.
« no previous file with comments | « net/quic/core/congestion_control/rtt_stats.cc ('k') | net/quic/core/congestion_control/tcp_cubic_sender_bytes.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698