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

Unified Diff: net/quic/core/crypto/quic_crypto_server_config.cc

Issue 2512833002: adds std:: to stl types (Closed)
Patch Set: Created 4 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
« no previous file with comments | « no previous file | net/quic/core/crypto/quic_crypto_server_config_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/core/crypto/quic_crypto_server_config.cc
diff --git a/net/quic/core/crypto/quic_crypto_server_config.cc b/net/quic/core/crypto/quic_crypto_server_config.cc
index 7c92ffad6deda9e457c65f5e85eb58ecfcc375c5..2c5880eb07018cbeeb63c41012f4ac97cae1959d 100644
--- a/net/quic/core/crypto/quic_crypto_server_config.cc
+++ b/net/quic/core/crypto/quic_crypto_server_config.cc
@@ -414,9 +414,9 @@ CryptoHandshakeMessage* QuicCryptoServerConfig::AddDefaultConfig(
}
bool QuicCryptoServerConfig::SetConfigs(
- const vector<std::unique_ptr<QuicServerConfigProtobuf>>& protobufs,
+ const std::vector<std::unique_ptr<QuicServerConfigProtobuf>>& protobufs,
const QuicWallTime now) {
- vector<scoped_refptr<Config>> parsed_configs;
+ std::vector<scoped_refptr<Config>> parsed_configs;
bool ok = true;
for (auto& protobuf : protobufs) {
@@ -442,7 +442,7 @@ bool QuicCryptoServerConfig::SetConfigs(
base::AutoLock locked(configs_lock_);
ConfigMap new_configs;
- for (vector<scoped_refptr<Config>>::const_iterator i =
+ for (std::vector<scoped_refptr<Config>>::const_iterator i =
parsed_configs.begin();
i != parsed_configs.end(); ++i) {
scoped_refptr<Config> config = *i;
@@ -1120,7 +1120,7 @@ bool QuicCryptoServerConfig::ConfigPrimaryTimeLessThan(
void QuicCryptoServerConfig::SelectNewPrimaryConfig(
const QuicWallTime now) const {
- vector<scoped_refptr<Config>> configs;
+ std::vector<scoped_refptr<Config>> configs;
configs.reserve(configs_.size());
for (ConfigMap::const_iterator it = configs_.begin(); it != configs_.end();
@@ -1825,7 +1825,7 @@ QuicCryptoServerConfig::ParseConfigProtobuf(
LOG(WARNING) << "Server config message is missing AEAD";
return nullptr;
}
- config->aead = vector<QuicTag>(aead_tags, aead_tags + aead_len);
+ config->aead = std::vector<QuicTag>(aead_tags, aead_tags + aead_len);
const QuicTag* kexs_tags;
size_t kexs_len;
@@ -1843,7 +1843,7 @@ QuicCryptoServerConfig::ParseConfigProtobuf(
LOG(WARNING) << "Server config message is missing or has invalid TBKP";
return nullptr;
}
- config->tb_key_params = vector<QuicTag>(tbkp_tags, tbkp_tags + tbkp_len);
+ config->tb_key_params = std::vector<QuicTag>(tbkp_tags, tbkp_tags + tbkp_len);
StringPiece orbit;
if (!msg->GetStringPiece(kORBT, &orbit)) {
« no previous file with comments | « no previous file | net/quic/core/crypto/quic_crypto_server_config_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698