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

Unified Diff: net/quic/quic_received_packet_manager.cc

Issue 925423004: Fully qualify std::* names being exported internally by using (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ignore_goaways_86198166
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
« no previous file with comments | « net/quic/quic_framer.cc ('k') | net/quic/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/quic_received_packet_manager.cc
diff --git a/net/quic/quic_received_packet_manager.cc b/net/quic/quic_received_packet_manager.cc
index f5e2c36e8838fb9a9531035cf12969d451c474ba..dcc7823835e16884077f967ae24be9896f0cd892 100644
--- a/net/quic/quic_received_packet_manager.cc
+++ b/net/quic/quic_received_packet_manager.cc
@@ -13,7 +13,6 @@
#include "net/quic/crypto/crypto_protocol.h"
#include "net/quic/quic_connection_stats.h"
-using std::make_pair;
using std::max;
using std::min;
using std::numeric_limits;
@@ -81,13 +80,13 @@ void QuicReceivedPacketManager::EntropyTracker::RecordPacketEntropyHash(
if (sequence_number > largest_observed_) {
for (QuicPacketSequenceNumber i = 0;
i < (sequence_number - largest_observed_ - 1); ++i) {
- packets_entropy_.push_back(make_pair(0, false));
+ packets_entropy_.push_back(std::make_pair(0, false));
}
- packets_entropy_.push_back(make_pair(entropy_hash, true));
+ packets_entropy_.push_back(std::make_pair(entropy_hash, true));
largest_observed_ = sequence_number;
} else {
packets_entropy_[sequence_number - first_gap_] =
- make_pair(entropy_hash, true);
+ std::make_pair(entropy_hash, true);
AdvanceFirstGapAndGarbageCollectEntropyMap();
}
« no previous file with comments | « net/quic/quic_framer.cc ('k') | net/quic/quic_received_packet_manager_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698