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

Unified Diff: net/quic/core/quic_multipath_sent_packet_manager.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
« no previous file with comments | « net/quic/core/quic_headers_stream_test.cc ('k') | net/quic/core/quic_packet_creator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/core/quic_multipath_sent_packet_manager.cc
diff --git a/net/quic/core/quic_multipath_sent_packet_manager.cc b/net/quic/core/quic_multipath_sent_packet_manager.cc
index 87010370a6b89130e5bbbac9d1321043ba5cc69b..45c880575a9c83863a4a4206e4ac17fda1e493cc 100644
--- a/net/quic/core/quic_multipath_sent_packet_manager.cc
+++ b/net/quic/core/quic_multipath_sent_packet_manager.cc
@@ -10,7 +10,6 @@
#include "net/quic/core/quic_bug_tracker.h"
using std::string;
-using std::max;
namespace net {
@@ -287,9 +286,9 @@ QuicPacketCount QuicMultipathSentPacketManager::EstimateMaxPacketsInFlight(
for (PathSentPacketManagerInfo path_manager_info : path_managers_info_) {
if (path_manager_info.manager != nullptr) {
max_packets_in_flight =
- max(max_packets_in_flight,
- path_manager_info.manager->EstimateMaxPacketsInFlight(
- max_packet_length));
+ std::max(max_packets_in_flight,
+ path_manager_info.manager->EstimateMaxPacketsInFlight(
+ max_packet_length));
}
}
DCHECK_LT(0u, max_packets_in_flight);
« no previous file with comments | « net/quic/core/quic_headers_stream_test.cc ('k') | net/quic/core/quic_packet_creator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698