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

Unified Diff: net/quic/core/quic_frame_list.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_crypto_client_stream.cc ('k') | net/quic/core/quic_framer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/core/quic_frame_list.cc
diff --git a/net/quic/core/quic_frame_list.cc b/net/quic/core/quic_frame_list.cc
index f4890f14e7e51613dafe7db60e13d034d0bac9a3..fc6608e689a99199f9c547815bddb3096a6e26f7 100644
--- a/net/quic/core/quic_frame_list.cc
+++ b/net/quic/core/quic_frame_list.cc
@@ -8,7 +8,6 @@
#include "base/logging.h"
-using std::list;
using std::string;
namespace net {
@@ -60,7 +59,7 @@ QuicErrorCode QuicFrameList::OnStreamData(QuicStreamOffset offset,
// Finds the place the frame should be inserted. If an identical frame is
// present, stops on the identical frame.
-list<QuicFrameList::FrameData>::iterator QuicFrameList::FindInsertionPoint(
+std::list<QuicFrameList::FrameData>::iterator QuicFrameList::FindInsertionPoint(
QuicStreamOffset offset,
size_t len) {
if (frame_list_.empty()) {
@@ -87,7 +86,7 @@ list<QuicFrameList::FrameData>::iterator QuicFrameList::FindInsertionPoint(
bool QuicFrameList::FrameOverlapsBufferedData(
QuicStreamOffset offset,
size_t data_len,
- list<FrameData>::const_iterator insertion_point) const {
+ std::list<FrameData>::const_iterator insertion_point) const {
if (frame_list_.empty() || insertion_point == frame_list_.end()) {
return false;
}
@@ -116,7 +115,7 @@ bool QuicFrameList::FrameOverlapsBufferedData(
bool QuicFrameList::IsDuplicate(
QuicStreamOffset offset,
size_t data_len,
- list<FrameData>::const_iterator insertion_point) const {
+ std::list<FrameData>::const_iterator insertion_point) const {
// A frame is duplicate if the frame offset is smaller than the bytes consumed
// or identical to an already received frame.
return offset < total_bytes_read_ || (insertion_point != frame_list_.end() &&
@@ -124,7 +123,7 @@ bool QuicFrameList::IsDuplicate(
}
int QuicFrameList::GetReadableRegions(struct iovec* iov, int iov_len) const {
- list<FrameData>::const_iterator it = frame_list_.begin();
+ std::list<FrameData>::const_iterator it = frame_list_.begin();
int index = 0;
QuicStreamOffset offset = total_bytes_read_;
while (it != frame_list_.end() && index < iov_len) {
@@ -144,7 +143,7 @@ int QuicFrameList::GetReadableRegions(struct iovec* iov, int iov_len) const {
}
bool QuicFrameList::GetReadableRegion(iovec* iov, QuicTime* timestamp) const {
- list<FrameData>::const_iterator it = frame_list_.begin();
+ std::list<FrameData>::const_iterator it = frame_list_.begin();
if (it == frame_list_.end() || it->offset != total_bytes_read_) {
return false;
}
@@ -157,7 +156,7 @@ bool QuicFrameList::GetReadableRegion(iovec* iov, QuicTime* timestamp) const {
bool QuicFrameList::MarkConsumed(size_t bytes_used) {
size_t end_offset = total_bytes_read_ + bytes_used;
while (!frame_list_.empty() && end_offset != total_bytes_read_) {
- list<FrameData>::iterator it = frame_list_.begin();
+ std::list<FrameData>::iterator it = frame_list_.begin();
if (it->offset != total_bytes_read_) {
return false;
}
@@ -184,7 +183,7 @@ bool QuicFrameList::MarkConsumed(size_t bytes_used) {
}
size_t QuicFrameList::Readv(const struct iovec* iov, size_t iov_len) {
- list<FrameData>::iterator it = frame_list_.begin();
+ std::list<FrameData>::iterator it = frame_list_.begin();
size_t iov_index = 0;
size_t iov_offset = 0;
size_t frame_offset = 0;
« no previous file with comments | « net/quic/core/quic_crypto_client_stream.cc ('k') | net/quic/core/quic_framer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698