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

Unified Diff: net/quic/crypto/strike_register.cc

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.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
« no previous file with comments | « net/quic/crypto/quic_server_info.h ('k') | net/quic/crypto/strike_register_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/crypto/strike_register.cc
diff --git a/net/quic/crypto/strike_register.cc b/net/quic/crypto/strike_register.cc
index fd5dc4fa925a8dbf90adcd30c45b2d3aeeee2e21..c36d3701ae48d10558f7b340232f1d0c201fbb37 100644
--- a/net/quic/crypto/strike_register.cc
+++ b/net/quic/crypto/strike_register.cc
@@ -8,7 +8,6 @@
#include "base/logging.h"
-using std::make_pair;
using std::max;
using std::min;
using std::pair;
@@ -324,7 +323,7 @@ pair<uint32, uint32> StrikeRegister::GetValidRange(
uint32 current_time_internal) const {
if (current_time_internal < horizon_) {
// Empty valid range.
- return make_pair(std::numeric_limits<uint32>::max(), 0);
+ return std::make_pair(std::numeric_limits<uint32>::max(), 0);
}
uint32 lower_bound;
@@ -344,7 +343,7 @@ pair<uint32, uint32> StrikeRegister::GetValidRange(
current_time_internal + min(current_time_internal - horizon_,
window_secs_);
- return make_pair(lower_bound, upper_bound);
+ return std::make_pair(lower_bound, upper_bound);
}
uint32 StrikeRegister::ExternalTimeToInternal(uint32 external_time) const {
« no previous file with comments | « net/quic/crypto/quic_server_info.h ('k') | net/quic/crypto/strike_register_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698