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

Unified Diff: net/quic/quic_stream_sequencer.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_sent_packet_manager.cc ('k') | net/quic/quic_stream_sequencer_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_stream_sequencer.cc
diff --git a/net/quic/quic_stream_sequencer.cc b/net/quic/quic_stream_sequencer.cc
index 7a9ae0dba981695af198077e5487e259851b0d87..7f06ec46d9a6600e3fa3475c0c9852471e4b8fcf 100644
--- a/net/quic/quic_stream_sequencer.cc
+++ b/net/quic/quic_stream_sequencer.cc
@@ -11,7 +11,6 @@
#include "base/metrics/sparse_histogram.h"
#include "net/quic/reliable_quic_stream.h"
-using std::make_pair;
using std::min;
using std::numeric_limits;
using std::string;
@@ -103,7 +102,7 @@ void QuicStreamSequencer::OnStreamFrame(const QuicStreamFrame& frame) {
for (size_t i = 0; i < data.Size(); ++i) {
DVLOG(1) << "Buffering stream data at offset " << byte_offset;
const iovec& iov = data.iovec()[i];
- buffered_frames_.insert(make_pair(
+ buffered_frames_.insert(std::make_pair(
byte_offset, string(static_cast<char*>(iov.iov_base), iov.iov_len)));
byte_offset += iov.iov_len;
num_bytes_buffered_ += iov.iov_len;
@@ -195,8 +194,8 @@ int QuicStreamSequencer::Readv(const struct iovec* iov, size_t iov_len) {
}
// We've finished copying. If we have a partial frame, update it.
if (frame_offset != 0) {
- buffered_frames_.insert(
- make_pair(it->first + frame_offset, it->second.substr(frame_offset)));
+ buffered_frames_.insert(std::make_pair(it->first + frame_offset,
+ it->second.substr(frame_offset)));
buffered_frames_.erase(buffered_frames_.begin());
RecordBytesConsumed(frame_offset);
}
@@ -283,7 +282,7 @@ void QuicStreamSequencer::FlushBufferedFrames() {
} else {
string new_data = it->second.substr(bytes_consumed);
buffered_frames_.erase(it);
- buffered_frames_.insert(make_pair(num_bytes_consumed_, new_data));
+ buffered_frames_.insert(std::make_pair(num_bytes_consumed_, new_data));
return;
}
}
« no previous file with comments | « net/quic/quic_sent_packet_manager.cc ('k') | net/quic/quic_stream_sequencer_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698