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

Unified Diff: net/quic/quic_stream_sequencer.cc

Issue 763833003: Remove using namespace in net/quic/quic_stream_sequencer.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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/quic_stream_sequencer.cc
diff --git a/net/quic/quic_stream_sequencer.cc b/net/quic/quic_stream_sequencer.cc
index 5df81e5dfc02cb89afa9939c40b5b6fdc4b0e981..63cf0b60af06407128f8453354fec5d3a29d504a 100644
--- a/net/quic/quic_stream_sequencer.cc
+++ b/net/quic/quic_stream_sequencer.cc
@@ -98,7 +98,8 @@ void QuicStreamSequencer::OnStreamFrame(const QuicStreamFrame& frame) {
DVLOG(1) << "Buffering stream data at offset " << byte_offset;
const iovec& iov = data.iovec()[i];
buffered_frames_.insert(make_pair(
- byte_offset, string(static_cast<char*>(iov.iov_base), iov.iov_len)));
+ byte_offset,
+ std::string(static_cast<char*>(iov.iov_base), iov.iov_len)));
byte_offset += iov.iov_len;
num_bytes_buffered_ += iov.iov_len;
}
@@ -261,7 +262,7 @@ void QuicStreamSequencer::FlushBufferedFrames() {
FrameMap::iterator it = buffered_frames_.find(num_bytes_consumed_);
while (it != buffered_frames_.end()) {
DVLOG(1) << "Flushing buffered packet at offset " << it->first;
- string* data = &it->second;
+ std::string* data = &it->second;
size_t bytes_consumed = stream_->ProcessRawData(data->c_str(),
data->size());
RecordBytesConsumed(bytes_consumed);
@@ -275,7 +276,7 @@ void QuicStreamSequencer::FlushBufferedFrames() {
buffered_frames_.erase(it);
it = buffered_frames_.find(num_bytes_consumed_);
} else {
- string new_data = it->second.substr(bytes_consumed);
+ std::string new_data = it->second.substr(bytes_consumed);
buffered_frames_.erase(it);
buffered_frames_.insert(make_pair(num_bytes_consumed_, new_data));
return;

Powered by Google App Engine
This is Rietveld 408576698