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

Unified Diff: net/quic/quic_framer.cc

Issue 941933002: win vs2015: fix variable shadowing warnings in net/quic (Closed) Base URL: https://chromium.googlesource.com/chromium/src.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
« net/quic/crypto/strike_register.cc ('K') | « net/quic/crypto/strike_register.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_framer.cc
diff --git a/net/quic/quic_framer.cc b/net/quic/quic_framer.cc
index 4ff23a41500ac9388dd074a3c77eadbfaa8d1aea..4d387cf4183d87a178512ff460dd45bd291cd15d 100644
--- a/net/quic/quic_framer.cc
+++ b/net/quic/quic_framer.cc
@@ -1347,8 +1347,8 @@ bool QuicFramer::ProcessAckFrame(uint8 frame_type, QuicAckFrame* ack_frame) {
set_detailed_error("Unable to read missing sequence number range.");
return false;
}
- for (size_t i = 0; i <= range_length; ++i) {
- ack_frame->missing_packets.insert(last_sequence_number - i);
+ for (size_t j = 0; j <= range_length; ++j) {
+ ack_frame->missing_packets.insert(last_sequence_number - j);
}
// Subtract an extra 1 to ensure ranges are represented efficiently and
// can't overlap by 1 sequence number. This allows a missing_delta of 0
@@ -2099,9 +2099,10 @@ bool QuicFramer::AppendTimestampToAckFrame(const QuicAckFrame& frame,
return false;
}
- uint64 time_delta_us = it->second.Subtract(prev_time).ToMicroseconds();
+ uint64 frame_time_delta_us =
+ it->second.Subtract(prev_time).ToMicroseconds();
prev_time = it->second;
- if (!writer->WriteUFloat16(time_delta_us)) {
+ if (!writer->WriteUFloat16(frame_time_delta_us)) {
return false;
}
}
« net/quic/crypto/strike_register.cc ('K') | « net/quic/crypto/strike_register.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698