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

Unified Diff: net/quic/core/congestion_control/hybrid_slow_start.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/hybrid_slow_start.cc
diff --git a/net/quic/core/congestion_control/hybrid_slow_start.cc b/net/quic/core/congestion_control/hybrid_slow_start.cc
index 3224cd67cf67b71518d2387a3ede3603f2a6ae61..16b7dcf78a86a3ccc7bbee14ca0080e1c027ed80 100644
--- a/net/quic/core/congestion_control/hybrid_slow_start.cc
+++ b/net/quic/core/congestion_control/hybrid_slow_start.cc
@@ -6,8 +6,6 @@
#include <algorithm>
-using std::max;
-using std::min;
namespace net {
@@ -88,11 +86,11 @@ bool HybridSlowStart::ShouldExitSlowStart(QuicTime::Delta latest_rtt,
int64_t min_rtt_increase_threshold_us =
min_rtt.ToMicroseconds() >> kHybridStartDelayFactorExp;
// Ensure the rtt threshold is never less than 2ms or more than 16ms.
- min_rtt_increase_threshold_us =
- min(min_rtt_increase_threshold_us, kHybridStartDelayMaxThresholdUs);
+ min_rtt_increase_threshold_us = std::min(min_rtt_increase_threshold_us,
+ kHybridStartDelayMaxThresholdUs);
QuicTime::Delta min_rtt_increase_threshold =
- QuicTime::Delta::FromMicroseconds(max(min_rtt_increase_threshold_us,
- kHybridStartDelayMinThresholdUs));
+ QuicTime::Delta::FromMicroseconds(std::max(
+ min_rtt_increase_threshold_us, kHybridStartDelayMinThresholdUs));
if (current_min_rtt_ > min_rtt + min_rtt_increase_threshold) {
hystart_found_ = DELAY;
« no previous file with comments | « net/quic/core/congestion_control/general_loss_algorithm_test.cc ('k') | net/quic/core/congestion_control/pacing_sender.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698