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

Unified Diff: net/quic/core/quic_received_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_packets.cc ('k') | net/quic/core/quic_received_packet_manager_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/core/quic_received_packet_manager.cc
diff --git a/net/quic/core/quic_received_packet_manager.cc b/net/quic/core/quic_received_packet_manager.cc
index 921870495b12532294055e20f0bea870cbc97426..2c8fce05295066a2323e2d848436d202b2f74645 100644
--- a/net/quic/core/quic_received_packet_manager.cc
+++ b/net/quic/core/quic_received_packet_manager.cc
@@ -15,8 +15,6 @@
#include "net/quic/core/quic_connection_stats.h"
#include "net/quic/core/quic_flags.h"
-using std::max;
-using std::min;
namespace net {
@@ -55,12 +53,12 @@ void QuicReceivedPacketManager::RecordPacketReceived(
// Record how out of order stats.
++stats_->packets_reordered;
stats_->max_sequence_reordering =
- max(stats_->max_sequence_reordering,
- ack_frame_.largest_observed - packet_number);
+ std::max(stats_->max_sequence_reordering,
+ ack_frame_.largest_observed - packet_number);
int64_t reordering_time_us =
(receipt_time - time_largest_observed_).ToMicroseconds();
stats_->max_time_reordering_us =
- max(stats_->max_time_reordering_us, reordering_time_us);
+ std::max(stats_->max_time_reordering_us, reordering_time_us);
}
if (packet_number > ack_frame_.largest_observed) {
ack_frame_.largest_observed = packet_number;
@@ -149,7 +147,7 @@ bool QuicReceivedPacketManager::HasMissingPackets() const {
return ack_frame_.packets.NumIntervals() > 1 ||
(!ack_frame_.packets.Empty() &&
ack_frame_.packets.Min() >
- max(QuicPacketNumber(1), peer_least_packet_awaiting_ack_));
+ std::max(QuicPacketNumber(1), peer_least_packet_awaiting_ack_));
}
bool QuicReceivedPacketManager::HasNewMissingPackets() const {
« no previous file with comments | « net/quic/core/quic_packets.cc ('k') | net/quic/core/quic_received_packet_manager_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698