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

Unified Diff: net/quic/congestion_control/send_algorithm_simulator.cc

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months 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/congestion_control/send_algorithm_simulator.cc
diff --git a/net/quic/congestion_control/send_algorithm_simulator.cc b/net/quic/congestion_control/send_algorithm_simulator.cc
index eedebe53f563be09bfbcf97aaef73eb909c56eb4..3d6d4561d380798e94a6973afcfb7de4e46e5589 100644
--- a/net/quic/congestion_control/send_algorithm_simulator.cc
+++ b/net/quic/congestion_control/send_algorithm_simulator.cc
@@ -11,7 +11,6 @@
#include "net/quic/crypto/quic_random.h"
using std::list;
-using std::make_pair;
using std::max;
using std::min;
using std::string;
@@ -290,13 +289,13 @@ void SendAlgorithmSimulator::HandlePendingAck(Transfer* transfer) {
if (it->sequence_number > sender->last_acked) {
DVLOG(1) << "Lost packet:" << sender->last_acked
<< " dropped by buffer overflow.";
- lost_packets.push_back(make_pair(sender->last_acked, info));
+ lost_packets.push_back(std::make_pair(sender->last_acked, info));
continue;
}
if (it->lost) {
- lost_packets.push_back(make_pair(sender->last_acked, info));
+ lost_packets.push_back(std::make_pair(sender->last_acked, info));
} else {
- acked_packets.push_back(make_pair(sender->last_acked, info));
+ acked_packets.push_back(std::make_pair(sender->last_acked, info));
}
// This packet has been acked or lost, remove it from sent_packets_.
largest_observed = *it;
« no previous file with comments | « net/quic/congestion_control/receive_algorithm_interface.cc ('k') | net/quic/congestion_control/tcp_cubic_sender_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698