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

Unified Diff: net/quic/core/congestion_control/pacing_sender.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/pacing_sender.cc
diff --git a/net/quic/core/congestion_control/pacing_sender.cc b/net/quic/core/congestion_control/pacing_sender.cc
index 8ce6e8ae962e1765db84573ee33fd57fd4026c37..5cac490f9c7009959df612d38559ca8d08671afd 100644
--- a/net/quic/core/congestion_control/pacing_sender.cc
+++ b/net/quic/core/congestion_control/pacing_sender.cc
@@ -8,7 +8,6 @@
#include "net/quic/core/quic_flags.h"
-using std::min;
namespace net {
namespace {
@@ -71,7 +70,7 @@ bool PacingSender::OnPacketSent(
// Add more burst tokens anytime the connection is leaving quiescence, but
// limit it to the equivalent of a single bulk write, not exceeding the
// current CWND in packets.
- burst_tokens_ = min(
+ burst_tokens_ = std::min(
kInitialUnpacedBurst,
static_cast<uint32_t>(sender_->GetCongestionWindow() / kDefaultTCPMSS));
}
@@ -146,8 +145,8 @@ QuicBandwidth PacingSender::PacingRate(QuicByteCount bytes_in_flight) const {
DCHECK(sender_ != nullptr);
if (!max_pacing_rate_.IsZero()) {
return QuicBandwidth::FromBitsPerSecond(
- min(max_pacing_rate_.ToBitsPerSecond(),
- sender_->PacingRate(bytes_in_flight).ToBitsPerSecond()));
+ std::min(max_pacing_rate_.ToBitsPerSecond(),
+ sender_->PacingRate(bytes_in_flight).ToBitsPerSecond()));
}
return sender_->PacingRate(bytes_in_flight);
}
« no previous file with comments | « net/quic/core/congestion_control/hybrid_slow_start.cc ('k') | net/quic/core/congestion_control/rtt_stats.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698