Index: net/quic/congestion_control/hybrid_slow_start.cc |
diff --git a/net/quic/congestion_control/hybrid_slow_start.cc b/net/quic/congestion_control/hybrid_slow_start.cc |
index 0edb10e86ea092024941e9821cd6358d93708e11..6d4c9d131cfb8a92f09a574a5124b949313c01be 100644 |
--- a/net/quic/congestion_control/hybrid_slow_start.cc |
+++ b/net/quic/congestion_control/hybrid_slow_start.cc |
@@ -6,6 +6,9 @@ |
#include <algorithm> |
+using std::max; |
+using std::min; |
+ |
namespace net { |
// Note(pwestin): the magic clamping numbers come from the original code in |
@@ -86,10 +89,10 @@ void HybridSlowStart::Update(QuicTime::Delta rtt, QuicTime::Delta delay_min) { |
if (sample_count_ == kHybridStartMinSamples) { |
int accepted_variance_us = delay_min.ToMicroseconds() >> |
kHybridStartDelayFactorExp; |
- accepted_variance_us = std::min(accepted_variance_us, |
+ accepted_variance_us = min(accepted_variance_us, |
kHybridStartDelayMaxThresholdUs); |
ramant (doing other things)
2014/01/07 19:20:40
nit: consider fixing indentation on line# 43.
|
QuicTime::Delta accepted_variance = QuicTime::Delta::FromMicroseconds( |
- std::max(accepted_variance_us, kHybridStartDelayMinThresholdUs)); |
+ max(accepted_variance_us, kHybridStartDelayMinThresholdUs)); |
if (current_rtt_ > delay_min.Add(accepted_variance)) { |
found_delay_ = true; |