From e32a8d469832de3d7b73e97744cf7b418b5d2751 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 14 Aug 2021 17:07:33 -0700 Subject: [PATCH] convert make_pair to emplace emplace* forwards the arguments directly. Avoids needing make_pair. Signed-off-by: Rosen Penev --- modules/tinydnsbackend/tinydnsbackend.cc | 2 +- pdns/auth-zonecache.cc | 2 +- pdns/bpf-filter.cc | 4 +- pdns/calidns.cc | 4 +- pdns/cdb.cc | 2 +- pdns/dbdnsseckeeper.cc | 2 +- pdns/decafsigners.cc | 16 ++--- pdns/delaypipe.cc | 2 +- pdns/distributor.hh | 2 +- pdns/dnsbackend.cc | 2 +- pdns/dnsdist-console.cc | 2 +- pdns/dnsdist-lua-inspection.cc | 14 ++-- pdns/dnsdist-lua.cc | 10 +-- pdns/dnsdistdist/dnsdist-backend.cc | 2 +- pdns/dnsdistdist/doh.cc | 4 +- pdns/dnsgram.cc | 8 +-- pdns/dnspacket.cc | 6 +- pdns/dnsparser.cc | 8 +-- pdns/dnsparser.hh | 8 +-- pdns/dnspcap2protobuf.cc | 2 +- pdns/dnsrecords.cc | 2 +- pdns/dnsreplay.cc | 4 +- pdns/dnsscope.cc | 11 ++-- pdns/dnssecinfra.cc | 2 +- pdns/ixfr.cc | 2 +- pdns/lua-record.cc | 2 +- pdns/lua-recursor4.cc | 4 +- pdns/lwres.cc | 2 +- pdns/malloctrace.cc | 2 +- pdns/misc.hh | 4 +- pdns/mplexer.hh | 2 +- pdns/nsec3dig.cc | 4 +- pdns/opensslsigners.cc | 28 ++++---- pdns/pdns_recursor.cc | 20 +++--- pdns/pkcs11signers.cc | 19 +++--- pdns/proxy-protocol.cc | 4 +- pdns/qtype.cc | 2 +- pdns/rec_channel_rec.cc | 30 ++++----- pdns/recursordist/test-ednsoptions_cc.cc | 6 +- pdns/rfc2136handler.cc | 2 +- pdns/saxfr.cc | 2 +- pdns/sdig.cc | 11 ++-- pdns/slavecommunicator.cc | 2 +- pdns/sodiumsigners.cc | 4 +- pdns/statbag.cc | 4 +- pdns/syncres.cc | 18 +++--- pdns/test-dnsdist_cc.cc | 82 ++++++++++++------------ pdns/test-dnsdistpacketcache_cc.cc | 8 +-- pdns/test-dnsrecords_cc.cc | 2 +- pdns/test-misc_hh.cc | 18 +++--- pdns/test-packetcache_cc.cc | 6 +- pdns/test-packetcache_hh.cc | 38 +++++------ pdns/toysdig.cc | 2 +- pdns/ueberbackend.cc | 2 +- pdns/ws-recursor.cc | 6 +- 55 files changed, 227 insertions(+), 232 deletions(-) diff --git a/modules/tinydnsbackend/tinydnsbackend.cc b/modules/tinydnsbackend/tinydnsbackend.cc index 510f2b7273c2..aa6cf959d827 100644 --- a/modules/tinydnsbackend/tinydnsbackend.cc +++ b/modules/tinydnsbackend/tinydnsbackend.cc @@ -93,7 +93,7 @@ void TinyDNSBackend::getUpdatedMasters(vector* retDomains) auto domainInfo = s_domainInfo.lock(); //TODO: We could actually lock less if we do it per suffix. if (!domainInfo->count(d_suffix)) { TDI_t tmp; - domainInfo->insert(make_pair(d_suffix, tmp)); + domainInfo->emplace(d_suffix, tmp); } TDI_t* domains = &(*domainInfo)[d_suffix]; diff --git a/pdns/auth-zonecache.cc b/pdns/auth-zonecache.cc index 687879d0c798..f5e5adec3b18 100644 --- a/pdns/auth-zonecache.cc +++ b/pdns/auth-zonecache.cc @@ -131,7 +131,7 @@ void AuthZoneCache::add(const DNSName& zone, const int zoneId) { auto pending = d_pending.lock(); if (pending->d_replacePending) { - pending->d_pendingAdds.push_back({zone, zoneId}); + pending->d_pendingAdds.emplace_back(zone, zoneId); } } diff --git a/pdns/bpf-filter.cc b/pdns/bpf-filter.cc index f6fdceebba05..31c4c2e0f38c 100644 --- a/pdns/bpf-filter.cc +++ b/pdns/bpf-filter.cc @@ -387,7 +387,7 @@ std::vector > BPFFilter::getAddrStats() v4Key = nextV4Key; if (bpf_lookup_elem(maps->d_v4map.getHandle(), &v4Key, &value) == 0) { v4Addr.sin_addr.s_addr = ntohl(v4Key); - result.push_back(make_pair(ComboAddress(&v4Addr), value)); + result.emplace_back(ComboAddress(&v4Addr), value); } res = bpf_get_next_key(maps->d_v4map.getHandle(), &v4Key, &nextV4Key); @@ -399,7 +399,7 @@ std::vector > BPFFilter::getAddrStats() if (bpf_lookup_elem(maps->d_v6map.getHandle(), &nextV6Key, &value) == 0) { memcpy(&v6Addr.sin6_addr.s6_addr, &nextV6Key, sizeof(nextV6Key)); - result.push_back(make_pair(ComboAddress(&v6Addr), value)); + result.emplace_back(ComboAddress(&v6Addr), value); } res = bpf_get_next_key(maps->d_v6map.getHandle(), &nextV6Key, &nextV6Key); diff --git a/pdns/calidns.cc b/pdns/calidns.cc index e8dac6eb6d92..973e5309538e 100644 --- a/pdns/calidns.cc +++ b/pdns/calidns.cc @@ -399,14 +399,14 @@ try if(!subnet.empty() || !ecsRange.empty()) { EDNSSubnetOpts opt; opt.source = Netmask(subnet.empty() ? "0.0.0.0/32" : subnet); - ednsOptions.push_back(std::make_pair(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt))); + ednsOptions.emplace_back(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt)); } if(!ednsOptions.empty() || pw.getHeader()->id % 2) { pw.addOpt(1500, 0, EDNSOpts::DNSSECOK, ednsOptions); pw.commit(); } - unknown.emplace_back(std::make_shared>(packet)); + unknown.push_back(std::make_shared>(packet)); } shuffle(unknown.begin(), unknown.end(), pdns::dns_random_engine()); diff --git a/pdns/cdb.cc b/pdns/cdb.cc index 5dd391539f1a..55ade934e521 100644 --- a/pdns/cdb.cc +++ b/pdns/cdb.cc @@ -123,7 +123,7 @@ bool CDB::readNext(pair &value) { throw std::runtime_error("Error while reading value for key '" + key + "' from CDB database: " + std::to_string(ret)); } - value = make_pair(std::move(key), std::move(val)); + value = {std::move(key), std::move(val)}; return true; } diff --git a/pdns/dbdnsseckeeper.cc b/pdns/dbdnsseckeeper.cc index c8149f58f323..385e30208900 100644 --- a/pdns/dbdnsseckeeper.cc +++ b/pdns/dbdnsseckeeper.cc @@ -604,7 +604,7 @@ DNSSECKeeper::keyset_t DNSSECKeeper::getKeys(const DNSName& zone, bool useCache) else kmd.keyType = ZSK; - retkeyset.push_back(make_pair(dpk, kmd)); + retkeyset.emplace_back(dpk, kmd); } sort(retkeyset.begin(), retkeyset.end(), keyCompareByKindAndID); diff --git a/pdns/decafsigners.cc b/pdns/decafsigners.cc index 24df3d6ae2f3..cce6fd0479e3 100644 --- a/pdns/decafsigners.cc +++ b/pdns/decafsigners.cc @@ -67,10 +67,10 @@ DNSCryptoKeyEngine::storvector_t DecafED25519DNSCryptoKeyEngine::convertToISCVec PrivateKey: ODIyNjAzODQ2MjgwODAxMjI2NDUxOTAyMDQxNDIyNjI= */ - storvector_t storvector; - - storvector.push_back(make_pair("Algorithm", "15 (ED25519)")); - storvector.push_back(make_pair("PrivateKey", string((char*)d_seckey, DECAF_EDDSA_25519_PRIVATE_BYTES))); + auto storvector = storvector_t{ + {"Algorithm", "15 (ED25519)"}, + {"PrivateKey", string((char*)d_seckey, DECAF_EDDSA_25519_PRIVATE_BYTES)}, + }; return storvector; } @@ -203,10 +203,10 @@ DNSCryptoKeyEngine::storvector_t DecafED448DNSCryptoKeyEngine::convertToISCVecto PrivateKey: xZ+5Cgm463xugtkY5B0Jx6erFTXp13rYegst0qRtNsOYnaVpMx0Z/c5EiA9x8wWbDDct/U3FhYWA */ - storvector_t storvector; - - storvector.push_back(make_pair("Algorithm", "16 (ED448)")); - storvector.push_back(make_pair("PrivateKey", string((char*)d_seckey, DECAF_EDDSA_448_PRIVATE_BYTES))); + auto storvector = storvector_t{ + {"Algorithm", "16 (ED448)"}, + {"PrivateKey", string((char*)d_seckey, DECAF_EDDSA_448_PRIVATE_BYTES)}, + }; return storvector; } diff --git a/pdns/delaypipe.cc b/pdns/delaypipe.cc index 167f355fd7b8..be363d639191 100644 --- a/pdns/delaypipe.cc +++ b/pdns/delaypipe.cc @@ -162,7 +162,7 @@ void DelayPipe::worker() if(delay != 0 ) { int ret = d_pipe.readTimeout(&c, delay); if(ret > 0) { // we got an object - d_work.insert(make_pair(c.when, c.what)); + d_work.emplace(c.when, c.what); } else if(ret==0) { // EOF break; diff --git a/pdns/distributor.hh b/pdns/distributor.hh index 8dbf141e8ca0..a54b7099a97d 100644 --- a/pdns/distributor.hh +++ b/pdns/distributor.hh @@ -160,7 +160,7 @@ templateMultiThreadDistributordeclareArguments(name); - d_instances.push_back(make_pair(module,name)); + d_instances.emplace_back(module, name); } } diff --git a/pdns/dnsdist-console.cc b/pdns/dnsdist-console.cc index 591a0fd72a8e..5b27aec4d363 100644 --- a/pdns/dnsdist-console.cc +++ b/pdns/dnsdist-console.cc @@ -105,7 +105,7 @@ static void feedConfigDelta(const std::string& line) return; struct timeval now; gettimeofday(&now, 0); - g_confDelta.push_back({now,line}); + g_confDelta.emplace_back(now, line); } static string historyFile(const bool &ignoreHOME = false) diff --git a/pdns/dnsdist-lua-inspection.cc b/pdns/dnsdist-lua-inspection.cc index 71ff7da87942..3e09fef8cbf8 100644 --- a/pdns/dnsdist-lua-inspection.cc +++ b/pdns/dnsdist-lua-inspection.cc @@ -62,7 +62,7 @@ static std::unordered_map>> g vector> rcounts; rcounts.reserve(counts.size()); for(const auto& c : counts) - rcounts.push_back(make_pair(c.second, c.first.makeLowerCase())); + rcounts.emplace_back(c.second, c.first.makeLowerCase()); sort(rcounts.begin(), rcounts.end(), [](const decltype(rcounts)::value_type& a, const decltype(rcounts)::value_type& b) { @@ -150,7 +150,7 @@ static vector > > getRespRi continue; e["qname"]=c.name.toString(); e["rcode"]=std::to_string(c.dh.rcode); - ret.push_back(std::make_pair(count,e)); + ret.emplace_back(count, e); count++; } } @@ -251,7 +251,7 @@ void setupLuaInspection(LuaContext& luaCtx) vector> rcounts; rcounts.reserve(counts.size()); for(const auto& c : counts) - rcounts.push_back(make_pair(c.second, c.first)); + rcounts.emplace_back(c.second, c.first); sort(rcounts.begin(), rcounts.end(), [](const decltype(rcounts)::value_type& a, const decltype(rcounts)::value_type& b) { @@ -296,7 +296,7 @@ void setupLuaInspection(LuaContext& luaCtx) vector> rcounts; rcounts.reserve(counts.size()); for(const auto& c : counts) - rcounts.push_back(make_pair(c.second, c.first.makeLowerCase())); + rcounts.emplace_back(c.second, c.first.makeLowerCase()); sort(rcounts.begin(), rcounts.end(), [](const decltype(rcounts)::value_type& a, const decltype(rcounts)::value_type& b) { @@ -478,7 +478,7 @@ void setupLuaInspection(LuaContext& luaCtx) if (c.dh.opcode != 0) { extra = " (" + Opcode::to_s(c.dh.opcode) + ")"; } - out.insert(make_pair(c.when, (fmt % DiffTime(now, c.when) % c.requestor.toStringWithPort() % dnsdist::Protocol(c.protocol).toString() % "" % htons(c.dh.id) % c.name.toString() % qt.toString() % "" % (c.dh.tc ? "TC" : "") % (c.dh.rd? "RD" : "") % (c.dh.aa? "AA" : "") % ("Question" + extra)).str() )) ; + out.emplace(c.when, (fmt % DiffTime(now, c.when) % c.requestor.toStringWithPort() % dnsdist::Protocol(c.protocol).toString() % "" % htons(c.dh.id) % c.name.toString() % qt.toString() % "" % (c.dh.tc ? "TC" : "") % (c.dh.rd ? "RD" : "") % (c.dh.aa ? "AA" : "") % ("Question" + extra)).str()); if(limit && *limit==++num) break; @@ -516,10 +516,10 @@ void setupLuaInspection(LuaContext& luaCtx) } if (c.usec != std::numeric_limits::max()) { - out.insert(make_pair(c.when, (fmt % DiffTime(now, c.when) % c.requestor.toStringWithPort() % dnsdist::Protocol(c.protocol).toString() % c.ds.toStringWithPort() % htons(c.dh.id) % c.name.toString() % qt.toString() % (c.usec/1000.0) % (c.dh.tc ? "TC" : "") % (c.dh.rd? "RD" : "") % (c.dh.aa? "AA" : "") % (RCode::to_s(c.dh.rcode) + extra)).str() )) ; + out.emplace(c.when, (fmt % DiffTime(now, c.when) % c.requestor.toStringWithPort() % dnsdist::Protocol(c.protocol).toString() % c.ds.toStringWithPort() % htons(c.dh.id) % c.name.toString() % qt.toString() % (c.usec / 1000.0) % (c.dh.tc ? "TC" : "") % (c.dh.rd ? "RD" : "") % (c.dh.aa ? "AA" : "") % (RCode::to_s(c.dh.rcode) + extra)).str()); } else { - out.insert(make_pair(c.when, (fmt % DiffTime(now, c.when) % c.requestor.toStringWithPort() % dnsdist::Protocol(c.protocol).toString() % c.ds.toStringWithPort() % htons(c.dh.id) % c.name.toString() % qt.toString() % "T.O" % (c.dh.tc ? "TC" : "") % (c.dh.rd? "RD" : "") % (c.dh.aa? "AA" : "") % (RCode::to_s(c.dh.rcode) + extra)).str() )) ; + out.emplace(c.when, (fmt % DiffTime(now, c.when) % c.requestor.toStringWithPort() % dnsdist::Protocol(c.protocol).toString() % c.ds.toStringWithPort() % htons(c.dh.id) % c.name.toString() % qt.toString() % "T.O" % (c.dh.tc ? "TC" : "") % (c.dh.rd ? "RD" : "") % (c.dh.aa ? "AA" : "") % (RCode::to_s(c.dh.rcode) + extra)).str()); } if (limit && *limit == ++num) { diff --git a/pdns/dnsdist-lua.cc b/pdns/dnsdist-lua.cc index 1084b5bdcde5..8671f54ca0f9 100644 --- a/pdns/dnsdist-lua.cc +++ b/pdns/dnsdist-lua.cc @@ -138,7 +138,7 @@ static bool loadTLSCertificateAndKeys(const std::string& context, std::vector(certFiles); auto keyFile = boost::get(keyFiles); pairs.clear(); - pairs.push_back({certFile, keyFile}); + pairs.emplace_back(certFile, keyFile); } else if (certFiles.type() == typeid(std::vector>) && keyFiles.type() == typeid(std::vector>)) { @@ -147,7 +147,7 @@ static bool loadTLSCertificateAndKeys(const std::string& context, std::vector > > ret; int count=1; for(const auto& s : g_dstates.getCopy()) { - ret.push_back(make_pair(count++, s)); + ret.emplace_back(count++, s); } return ret; }); @@ -2311,8 +2311,8 @@ static void setupLuaConfig(LuaContext& luaCtx, bool client, bool configCheck) if (vars->count("customResponseHeaders")) { for (auto const& headerMap : boost::get>((*vars)["customResponseHeaders"])) { - std::pair headerResponse = std::make_pair(boost::to_lower_copy(headerMap.first), headerMap.second); - frontend->d_customResponseHeaders.push_back(headerResponse); + auto headerResponse = std::make_pair(boost::to_lower_copy(headerMap.first), headerMap.second); + frontend->d_customResponseHeaders.push_back(std::move(headerResponse)); } } diff --git a/pdns/dnsdistdist/dnsdist-backend.cc b/pdns/dnsdistdist/dnsdist-backend.cc index 3139cda6753c..bd3c31947cae 100644 --- a/pdns/dnsdistdist/dnsdist-backend.cc +++ b/pdns/dnsdistdist/dnsdist-backend.cc @@ -245,7 +245,7 @@ void ServerPool::addServer(shared_ptr& server) as other threads might hold a copy. We can however update the pointer as long as we hold the lock. */ unsigned int count = static_cast((*servers)->size()); auto newServers = std::make_shared(*(*servers)); - newServers->push_back(make_pair(++count, server)); + newServers->emplace_back(++count, server); /* we need to reorder based on the server 'order' */ std::stable_sort(newServers->begin(), newServers->end(), [](const std::pair >& a, const std::pair >& b) { return a.second->order < b.second->order; diff --git a/pdns/dnsdistdist/doh.cc b/pdns/dnsdistdist/doh.cc index 863ee78c563b..0b46a1a89bf6 100644 --- a/pdns/dnsdistdist/doh.cc +++ b/pdns/dnsdistdist/doh.cc @@ -841,8 +841,8 @@ static void doh_dispatch_query(DOHServerConfig* dsc, h2o_handler_t* self, h2o_re du->query_at = req->query_at; du->headers.reserve(req->headers.size); for (size_t i = 0; i < req->headers.size; ++i) { - du->headers.push_back(std::make_pair(std::string(req->headers.entries[i].name->base, req->headers.entries[i].name->len), - std::string(req->headers.entries[i].value.base, req->headers.entries[i].value.len))); + du->headers.emplace_back(std::string(req->headers.entries[i].name->base, req->headers.entries[i].name->len), + std::string(req->headers.entries[i].value.base, req->headers.entries[i].value.len)); } #ifdef HAVE_H2O_SOCKET_GET_SSL_SERVER_NAME diff --git a/pdns/dnsgram.cc b/pdns/dnsgram.cc index a3bdc7d8d146..fd03528bb8df 100644 --- a/pdns/dnsgram.cc +++ b/pdns/dnsgram.cc @@ -170,23 +170,23 @@ try g_clientQuestions++; totalQueries++; counts[make_pair(mdp.d_qname, mdp.d_qtype)]++; - questions.insert(make_pair(mdp.d_qname, mdp.d_qtype)); + questions.emplace(mdp.d_qname, mdp.d_qtype); } else if(mdp.d_header.rd && mdp.d_header.qr) { rdacounts[pr.d_pheader.ts.tv_sec + 0.01*(pr.d_pheader.ts.tv_usec/10000)]++; g_lastanswerTime=pr.d_pheader.ts; g_clientResponses++; - answers.insert(make_pair(mdp.d_qname, mdp.d_qtype)); + answers.emplace(mdp.d_qname, mdp.d_qtype); } else if(!mdp.d_header.rd && !mdp.d_header.qr) { g_lastquestionTime=pr.d_pheader.ts; g_serverQuestions++; counts[make_pair(mdp.d_qname, mdp.d_qtype)]++; - questions.insert(make_pair(mdp.d_qname, mdp.d_qtype)); + questions.emplace(mdp.d_qname, mdp.d_qtype); totalQueries++; } else if(!mdp.d_header.rd && mdp.d_header.qr) { - answers.insert(make_pair(mdp.d_qname, mdp.d_qtype)); + answers.emplace(mdp.d_qname, mdp.d_qtype); g_serverResponses++; } diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc index 9081e6fa25a2..b41949ce217d 100644 --- a/pdns/dnspacket.cc +++ b/pdns/dnspacket.cc @@ -318,7 +318,7 @@ void DNSPacket::wrapup() if(d_wantsnsid) { const static string mode_server_id=::arg()["server-id"]; if(mode_server_id != "disabled") { - opts.push_back(make_pair(EDNSOptionCode::NSID, mode_server_id)); + opts.emplace_back(EDNSOptionCode::NSID, mode_server_id); optsize += EDNS_OPTION_CODE_SIZE + EDNS_OPTION_LENGTH_SIZE + mode_server_id.size(); } } @@ -373,12 +373,12 @@ void DNSPacket::wrapup() eso.scope = Netmask(eso.source.getNetwork(), maxScopeMask); string opt = makeEDNSSubnetOptsString(eso); - opts.push_back(make_pair(8, opt)); // 'EDNS SUBNET' + opts.emplace_back(8, opt); // 'EDNS SUBNET' } if (d_haveednscookie && d_eco.isWellFormed()) { d_eco.makeServerCookie(s_EDNSCookieKey, getInnerRemote()); - opts.push_back(make_pair(EDNSOptionCode::COOKIE, d_eco.makeOptString())); + opts.emplace_back(EDNSOptionCode::COOKIE, d_eco.makeOptString()); } if(!opts.empty() || d_haveednssection || d_dnssecOk) diff --git a/pdns/dnsparser.cc b/pdns/dnsparser.cc index 10327144841f..84377b7828cf 100644 --- a/pdns/dnsparser.cc +++ b/pdns/dnsparser.cc @@ -124,7 +124,7 @@ std::shared_ptr DNSRecordContent::mastermake(const DNSRecord & { uint16_t searchclass = (dr.d_type == QType::OPT) ? 1 : dr.d_class; // class is invalid for OPT - typemap_t::const_iterator i=getTypemap().find(make_pair(searchclass, dr.d_type)); + auto i = getTypemap().find(make_pair(searchclass, dr.d_type)); if(i==getTypemap().end() || !i->second) { return std::make_shared(dr, pr); } @@ -135,7 +135,7 @@ std::shared_ptr DNSRecordContent::mastermake(const DNSRecord & std::shared_ptr DNSRecordContent::mastermake(uint16_t qtype, uint16_t qclass, const string& content) { - zmakermap_t::const_iterator i=getZmakermap().find(make_pair(qclass, qtype)); + auto i = getZmakermap().find(make_pair(qclass, qtype)); if(i==getZmakermap().end()) { return std::make_shared(content); } @@ -152,7 +152,7 @@ std::shared_ptr DNSRecordContent::mastermake(const DNSRecord & uint16_t searchclass = (dr.d_type == QType::OPT) ? 1 : dr.d_class; // class is invalid for OPT - typemap_t::const_iterator i=getTypemap().find(make_pair(searchclass, dr.d_type)); + auto i = getTypemap().find(make_pair(searchclass, dr.d_type)); if(i==getTypemap().end() || !i->second) { return std::make_shared(dr, pr); } @@ -298,7 +298,7 @@ void MOADNSParser::init(bool query, const pdns_string_view& packet) d_tsigPos = recordStartPos; } - d_answers.push_back(make_pair(std::move(dr), pr.getPosition() - sizeof(dnsheader))); + d_answers.emplace_back(std::move(dr), pr.getPosition() - sizeof(dnsheader)); } #if 0 diff --git a/pdns/dnsparser.hh b/pdns/dnsparser.hh index 3f39dd3ec5c8..5b79351b218c 100644 --- a/pdns/dnsparser.hh +++ b/pdns/dnsparser.hh @@ -237,13 +237,13 @@ public: if(z) getZmakermap()[make_pair(cl,ty)]=z; - getT2Namemap().insert(make_pair(make_pair(cl,ty), name)); - getN2Typemap().insert(make_pair(name, make_pair(cl,ty))); + getT2Namemap().emplace(make_pair(cl, ty), name); + getN2Typemap().emplace(name, make_pair(cl, ty)); } static void unregist(uint16_t cl, uint16_t ty) { - pair key=make_pair(cl, ty); + auto key = make_pair(cl, ty); getTypemap().erase(key); getZmakermap().erase(key); } @@ -267,7 +267,7 @@ public: static const string NumberToType(uint16_t num, uint16_t classnum=1) { - t2namemap_t::const_iterator iter = getT2Namemap().find(make_pair(classnum, num)); + auto iter = getT2Namemap().find(make_pair(classnum, num)); if(iter == getT2Namemap().end()) return "TYPE" + std::to_string(num); // throw runtime_error("Unknown DNS type with numerical id "+std::to_string(num)); diff --git a/pdns/dnspcap2protobuf.cc b/pdns/dnspcap2protobuf.cc index bf413edcc4dc..60a3311aca5c 100644 --- a/pdns/dnspcap2protobuf.cc +++ b/pdns/dnspcap2protobuf.cc @@ -104,7 +104,7 @@ try { queryTime.tv_sec = pr.d_pheader.ts.tv_sec; queryTime.tv_usec = pr.d_pheader.ts.tv_usec; uniqueId = getUniqueID(); - ids[dh->id] = std::make_pair(uniqueId, queryTime); + ids[dh->id] = {uniqueId, queryTime}; } else { const auto& it = ids.find(dh->id); diff --git a/pdns/dnsrecords.cc b/pdns/dnsrecords.cc index e110473cf971..d3f5741ecf3e 100644 --- a/pdns/dnsrecords.cc +++ b/pdns/dnsrecords.cc @@ -190,7 +190,7 @@ void OPTRecordContent::getData(vector >& options) string field(d_data.c_str() + pos, len); pos+=len; - options.push_back(make_pair(code, std::move(field))); + options.emplace_back(code, std::move(field)); } } diff --git a/pdns/dnsreplay.cc b/pdns/dnsreplay.cc index 3679e73bcb27..78226d919bd9 100644 --- a/pdns/dnsreplay.cc +++ b/pdns/dnsreplay.cc @@ -379,8 +379,8 @@ static void measureResultAndClean(qids_t::const_iterator iter) if(!g_quiet) cout<<"\t* orig better *"<> DNSCryptoKeyEngine::listAllAlgosWithBackend() vector> ret; for (auto const& value : getMakers()) { auto dcke = value.second(value.first); - ret.push_back(make_pair(value.first, dcke->getName())); + ret.emplace_back(value.first, dcke->getName()); } return ret; } diff --git a/pdns/ixfr.cc b/pdns/ixfr.cc index 9b1b4b33d34d..d299568488d0 100644 --- a/pdns/ixfr.cc +++ b/pdns/ixfr.cc @@ -116,7 +116,7 @@ vector, vector > > processIXFRRecords(const Co } } - ret.push_back(make_pair(remove,add)); + ret.emplace_back(remove, add); } return ret; diff --git a/pdns/lua-record.cc b/pdns/lua-record.cc index fb668c659ad8..2c75a15979dc 100644 --- a/pdns/lua-record.cc +++ b/pdns/lua-record.cc @@ -326,7 +326,7 @@ static ComboAddress pickwrandom(const vector >& wips) vector > pick; for(auto& i : wips) { sum += i.first; - pick.push_back({sum, i.second}); + pick.emplace_back(sum, i.second); } int r = dns_random(sum); auto p = upper_bound(pick.begin(), pick.end(), r, [](int rarg, const decltype(pick)::value_type& a) { return rarg < a.first; }); diff --git a/pdns/lua-recursor4.cc b/pdns/lua-recursor4.cc index 235e6b405e14..b77d98418a23 100644 --- a/pdns/lua-recursor4.cc +++ b/pdns/lua-recursor4.cc @@ -490,9 +490,9 @@ void RecursorLua4::getFeatures(Features& features) { // Add key-values pairs below. // Make sure you add string values explicitly converted to string. - // e.g. features.push_back(make_pair("somekey", string("stringvalue")); + // e.g. features.emplace_back("somekey", string("stringvalue"); // Both int and double end up as a lua number type. - features.push_back(make_pair("PR8001_devicename", true)); + features.emplace_back("PR8001_devicename", true); } void RecursorLua4::maintenance() const diff --git a/pdns/lwres.cc b/pdns/lwres.cc index 2fcba38c0f06..177632903cd2 100644 --- a/pdns/lwres.cc +++ b/pdns/lwres.cc @@ -344,7 +344,7 @@ static LWResult::Result asyncresolve(const ComboAddress& ip, const DNSName& doma outgoingECSBits = srcmask->getBits(); outgoingECSAddr = srcmask->getNetwork(); // cout<<"Adding request mask: "<d_ttd.tv_sec == 0 || tied <= boost::tie(it->d_ttd.tv_sec, it->d_ttd.tv_usec)) { break; } - ret.push_back(std::make_pair(it->d_fd, it->d_parameter)); + ret.emplace_back(it->d_fd, it->d_parameter); } return ret; diff --git a/pdns/nsec3dig.cc b/pdns/nsec3dig.cc index 44a8d0a39069..1caf49ff5193 100644 --- a/pdns/nsec3dig.cc +++ b/pdns/nsec3dig.cc @@ -177,10 +177,10 @@ try } // nsec3.insert(new nsec3() // cerr<first.d_name.getRawLabel(0)), toBase32Hex(r->d_nexthash))); + nsec3s.emplace(toLower(i->first.d_name.getRawLabel(0)), toBase32Hex(r->d_nexthash)); nsec3salt = r->d_salt; nsec3iters = r->d_iterations; - nsec3t.insert(make_pair(toLower(i->first.d_name.getRawLabel(0)), r->numberOfTypesSet())); + nsec3t.emplace(toLower(i->first.d_name.getRawLabel(0)), r->numberOfTypesSet()); } else { diff --git a/pdns/opensslsigners.cc b/pdns/opensslsigners.cc index 0f5396cea225..7138f9705285 100644 --- a/pdns/opensslsigners.cc +++ b/pdns/opensslsigners.cc @@ -262,14 +262,14 @@ DNSCryptoKeyEngine::storvector_t OpenSSLRSADNSCryptoKeyEngine::convertToISCVecto RSA_get0_key(d_key.get(), &n, &e, &d); RSA_get0_factors(d_key.get(), &p, &q); RSA_get0_crt_params(d_key.get(), &dmp1, &dmq1, &iqmp); - outputs.push_back(make_pair("Modulus", n)); - outputs.push_back(make_pair("PublicExponent", e)); - outputs.push_back(make_pair("PrivateExponent", d)); - outputs.push_back(make_pair("Prime1", p)); - outputs.push_back(make_pair("Prime2", q)); - outputs.push_back(make_pair("Exponent1", dmp1)); - outputs.push_back(make_pair("Exponent2", dmq1)); - outputs.push_back(make_pair("Coefficient", iqmp)); + outputs.emplace_back("Modulus", n); + outputs.emplace_back("PublicExponent", e); + outputs.emplace_back("PrivateExponent", d); + outputs.emplace_back("Prime1", p); + outputs.emplace_back("Prime2", q); + outputs.emplace_back("Exponent1", dmp1); + outputs.emplace_back("Exponent2", dmq1); + outputs.emplace_back("Coefficient", iqmp); string algorithm=std::to_string(d_algorithm); switch(d_algorithm) { @@ -286,7 +286,7 @@ DNSCryptoKeyEngine::storvector_t OpenSSLRSADNSCryptoKeyEngine::convertToISCVecto default: algorithm += " (?)"; } - storvect.push_back(make_pair("Algorithm", algorithm)); + storvect.emplace_back("Algorithm", algorithm); for(const outputs_t::value_type& value : outputs) { std::string tmp; @@ -294,7 +294,7 @@ DNSCryptoKeyEngine::storvector_t OpenSSLRSADNSCryptoKeyEngine::convertToISCVecto int len = BN_bn2bin(value.second, reinterpret_cast(&tmp.at(0))); if (len >= 0) { tmp.resize(len); - storvect.push_back(make_pair(value.first, tmp)); + storvect.emplace_back(value.first, tmp); } } @@ -640,7 +640,7 @@ DNSCryptoKeyEngine::storvector_t OpenSSLECDSADNSCryptoKeyEngine::convertToISCVec else algorithm = " ? (?)"; - storvect.push_back(make_pair("Algorithm", algorithm)); + storvect.emplace_back("Algorithm", algorithm); const BIGNUM *key = EC_KEY_get0_private_key(d_eckey.get()); if (key == nullptr) { @@ -655,7 +655,7 @@ DNSCryptoKeyEngine::storvector_t OpenSSLECDSADNSCryptoKeyEngine::convertToISCVec if (d_len - len) prefix.append(d_len - len, 0x00); - storvect.push_back(make_pair("PrivateKey", prefix + tmp)); + storvect.emplace_back("PrivateKey", prefix + tmp); return storvect; } @@ -943,7 +943,7 @@ DNSCryptoKeyEngine::storvector_t OpenSSLEDDSADNSCryptoKeyEngine::convertToISCVec algorithm = " ? (?)"; } - storvect.push_back(make_pair("Algorithm", algorithm)); + storvect.emplace_back("Algorithm", algorithm); string buf; size_t len = d_len; @@ -951,7 +951,7 @@ DNSCryptoKeyEngine::storvector_t OpenSSLEDDSADNSCryptoKeyEngine::convertToISCVec if (EVP_PKEY_get_raw_private_key(d_edkey.get(), reinterpret_cast(&buf.at(0)), &len) < 1) { throw runtime_error(getName() + " Could not get private key from d_edkey"); } - storvect.push_back(make_pair("PrivateKey", buf)); + storvect.emplace_back("PrivateKey", buf); return storvect; } diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc index 19203cf2f9b2..2070bd054a8e 100644 --- a/pdns/pdns_recursor.cc +++ b/pdns/pdns_recursor.cc @@ -995,7 +995,7 @@ static void updateResponseStats(int res, const ComboAddress& remote, unsigned in if(t_servfailremotes) { t_servfailremotes->push_back(remote); if(query && t_servfailqueryring) // packet cache - t_servfailqueryring->push_back(make_pair(*query, qtype)); + t_servfailqueryring->push_back({*query, qtype}); } g_stats.servFails++; break; @@ -1601,7 +1601,7 @@ static void startDoResolve(void *p) auto dc=std::unique_ptr(reinterpret_cast(p)); try { if (t_queryring) - t_queryring->push_back(make_pair(dc->d_mdp.d_qname, dc->d_mdp.d_qtype)); + t_queryring->push_back({dc->d_mdp.d_qname, dc->d_mdp.d_qtype}); uint16_t maxanswersize = dc->d_tcp ? 65535 : min(static_cast(512), g_udpTruncationThreshold); EDNSOpts edo; @@ -1648,7 +1648,7 @@ static void startDoResolve(void *p) const static string mode_server_id = ::arg()["server-id"]; if (mode_server_id != "disabled" && !mode_server_id.empty() && maxanswersize > (EDNSOptionCodeSize + EDNSOptionLengthSize + mode_server_id.size())) { - returnedEdnsOptions.push_back(make_pair(EDNSOptionCode::NSID, mode_server_id)); + returnedEdnsOptions.emplace_back(EDNSOptionCode::NSID, mode_server_id); variableAnswer = true; // Can't packetcache an answer with NSID maxanswersize -= EDNSOptionCodeSize + EDNSOptionLengthSize + mode_server_id.size(); } @@ -2041,7 +2041,7 @@ static void startDoResolve(void *p) if(t_bogusremotes) t_bogusremotes->push_back(dc->d_source); if(t_bogusqueryring) - t_bogusqueryring->push_back(make_pair(dc->d_mdp.d_qname, dc->d_mdp.d_qtype)); + t_bogusqueryring->push_back({dc->d_mdp.d_qname, dc->d_mdp.d_qtype}); if(g_dnssecLogBogus || sr.doLog() || g_dnssecmode == DNSSECMode::ValidateForLog) { g_log<d_mdp.d_qname<<"|"<d_mdp.d_qtype)<getRemote()<<" validates as "< 0) { padSize = std::min(blockSize - modulo, remaining); } - returnedEdnsOptions.push_back(make_pair(EDNSOptionCode::PADDING, makeEDNSPaddingOptString(padSize))); + returnedEdnsOptions.emplace_back(EDNSOptionCode::PADDING, makeEDNSPaddingOptString(padSize)); } } @@ -2227,7 +2227,7 @@ static void startDoResolve(void *p) eee.extraText = std::move(extra); if (pw.size() < maxanswersize && (maxanswersize - pw.size()) >= (EDNSOptionCodeSize + EDNSOptionLengthSize + sizeof(eee.infoCode) + eee.extraText.size())) { - returnedEdnsOptions.push_back(make_pair(EDNSOptionCode::EXTENDEDERROR, makeEDNSExtendedErrorOptString(eee))); + returnedEdnsOptions.emplace_back(EDNSOptionCode::EXTENDEDERROR, makeEDNSExtendedErrorOptString(eee)); } } @@ -2585,7 +2585,7 @@ static bool checkForCacheHit(bool qnameParsed, unsigned int tag, const string& d t_bogusremotes->push_back(source); } if (t_bogusqueryring) { - t_bogusqueryring->push_back(make_pair(qname, qtype)); + t_bogusqueryring->push_back({qname, qtype}); } } @@ -3564,7 +3564,7 @@ static void makeTCPServerSockets(deferredAdd_t& deferredAdds, std::set& tcp setNonBlocking(fd); setSocketSendBuffer(fd, 65000); listen(fd, 128); - deferredAdds.push_back(make_pair(fd, handleNewTCPQuestion)); + deferredAdds.emplace_back(fd, handleNewTCPQuestion); tcpSockets.insert(fd); // we don't need to update g_listenSocketsAddresses since it doesn't work for TCP/IP: @@ -3661,7 +3661,7 @@ static void makeUDPServerSockets(deferredAdd_t& deferredAdds) setNonBlocking(fd); - deferredAdds.push_back(make_pair(fd, handleNewUDPQuestion)); + deferredAdds.emplace_back(fd, handleNewUDPQuestion); g_listenSocketsAddresses[fd]=sin; // this is written to only from the startup thread, not from the workers if(sin.sin4.sin_family == AF_INET) g_log< > outputs_t; - outputs_t outputs; - - boost::assign::push_back(storvect) - (make_pair("Algorithm", std::to_string(d_algorithm))) - (make_pair("Engine", d_module)) - (make_pair("Slot", d_slot_id)) - (make_pair("PIN", d_pin)) - (make_pair("Label", d_label)) - (make_pair("PubLabel", d_pub_label)); + auto storvect = storvector_t{ + {"Algorithm", std::to_string(d_algorithm)}, + {"Engine", d_module}, + {"Slot", d_slot_id}, + {"PIN", d_pin}, + {"Label", d_label}, + {"PubLabel", d_pub_label}, + }; return storvect; }; diff --git a/pdns/proxy-protocol.cc b/pdns/proxy-protocol.cc index 2b07f63f963e..b7c7270e79ba 100644 --- a/pdns/proxy-protocol.cc +++ b/pdns/proxy-protocol.cc @@ -243,11 +243,11 @@ template ssize_t parseProxyHeader(const Container& header, b return 0; } - values.push_back({ std::string(reinterpret_cast(&header.at(pos)), len), type }); + values.push_back({std::string(reinterpret_cast(&header.at(pos)), len), type}); pos += len; } else { - values.push_back({ std::string(), type }); + values.push_back({"", type}); } remaining = got - pos; diff --git a/pdns/qtype.cc b/pdns/qtype.cc index b3d7d1408734..8f4302bcd540 100644 --- a/pdns/qtype.cc +++ b/pdns/qtype.cc @@ -101,7 +101,7 @@ static map swapElements(const map ret; for (const auto& n : names) { - ret.insert(make_pair(n.second, n.first)); + ret.emplace(n.second, n.first); } return ret; } diff --git a/pdns/rec_channel_rec.cc b/pdns/rec_channel_rec.cc index d20d01d1ae15..f98ebc79e605 100644 --- a/pdns/rec_channel_rec.cc +++ b/pdns/rec_channel_rec.cc @@ -45,11 +45,11 @@ std::pair PrefixDashNumberCompare::prefixAndTrailingNu { auto i = a.length(); if (i == 0) { - return make_pair(a, ""); + return {a, ""}; } --i; if (!std::isdigit(a[i])) { - return make_pair(a, ""); + return {a, ""}; } while (i > 0) { if (!std::isdigit(a[i])) { @@ -57,7 +57,7 @@ std::pair PrefixDashNumberCompare::prefixAndTrailingNu } --i; } - return make_pair(a.substr(0, i + 1), a.substr(i + 1, a.size() - i - 1)); + return {a.substr(0, i + 1), a.substr(i + 1, a.size() - i - 1)}; } bool PrefixDashNumberCompare::operator()(const std::string& a, const std::string& b) const @@ -197,18 +197,18 @@ StatsMap getAllStatsMap(StatComponent component) for(const auto& the32bits : d_get32bitpointers) { if (disabledlistMap.count(the32bits.first) == 0) { - ret.insert(make_pair(the32bits.first, StatsMapEntry{getPrometheusName(the32bits.first), std::to_string(*the32bits.second)})); + ret.emplace(the32bits.first, StatsMapEntry{getPrometheusName(the32bits.first), std::to_string(*the32bits.second)}); } } for(const auto& atomic : d_getatomics) { if (disabledlistMap.count(atomic.first) == 0) { - ret.insert(make_pair(atomic.first, StatsMapEntry{getPrometheusName(atomic.first), std::to_string(atomic.second->load())})); + ret.emplace(atomic.first, StatsMapEntry{getPrometheusName(atomic.first), std::to_string(atomic.second->load())}); } } for(const auto& the64bitmembers : d_get64bitmembers) { if (disabledlistMap.count(the64bitmembers.first) == 0) { - ret.insert(make_pair(the64bitmembers.first, StatsMapEntry{getPrometheusName(the64bitmembers.first), std::to_string(the64bitmembers.second())})); + ret.emplace(the64bitmembers.first, StatsMapEntry{getPrometheusName(the64bitmembers.first), std::to_string(the64bitmembers.second())}); } } @@ -221,7 +221,7 @@ StatsMap getAllStatsMap(StatComponent component) { for(const auto& a : *(d_dynmetrics.lock())) { if (disabledlistMap.count(a.first) == 0) { - ret.insert(make_pair(a.first, StatsMapEntry{a.second.d_prometheusName, std::to_string(*a.second.d_ptr)})); + ret.emplace(a.first, StatsMapEntry{a.second.d_prometheusName, std::to_string(*a.second.d_ptr)}); } } } @@ -486,7 +486,7 @@ static string doWipeCache(T begin, T end, uint16_t qtype) } catch (std::exception &e) { return "Error: " + std::string(e.what()) + ", nothing wiped\n"; } - toWipe.push_back({canon, subtree}); + toWipe.emplace_back(canon, subtree); } int count=0, pcount=0, countNeg=0; @@ -1159,7 +1159,7 @@ static StatsMap toCPUStatsMap(const string& name) for (unsigned int n = 0; n < g_numThreads; ++n) { uint64_t tm = doGetThreadCPUMsec(n); std::string pname = pbasename + "{thread=\"" + std::to_string(n) + "\"}"; - entries.emplace(make_pair(name + "-thread-" + std::to_string(n), StatsMapEntry{pname, std::to_string(tm)})); + entries.emplace(name + "-thread-" + std::to_string(n), StatsMapEntry{pname, std::to_string(tm)}); } return entries; } @@ -1606,9 +1606,9 @@ static string doGenericTopRemotes(pleaseremotefunc_t func) typedef std::multimap rcounts_t; rcounts_t rcounts; - - for(counts_t::const_iterator i=counts.begin(); i != counts.end(); ++i) - rcounts.insert(make_pair(-i->second, i->first)); + + for (auto&& c : counts) + rcounts.emplace(-c.second, c.first); ostringstream ret; ret<<"Over last "< rcounts_t; rcounts_t rcounts; - - for(counts_t::const_iterator i=counts.begin(); i != counts.end(); ++i) - rcounts.insert(make_pair(-i->second, i->first)); + + for (auto&& c : counts) + rcounts.emplace(-c.second, c.first); ostringstream ret; ret<<"Over last "<d_class == QClass::IN) { - rrSetKey_t key = make_pair(rr->d_name, QType(rr->d_type)); + rrSetKey_t key = {rr->d_name, QType(rr->d_type)}; rrVector_t *vec = &preReqRRsets[key]; vec->push_back(DNSResourceRecord::fromWire(*rr)); } diff --git a/pdns/saxfr.cc b/pdns/saxfr.cc index a7517804f0c5..20e677a9efb1 100644 --- a/pdns/saxfr.cc +++ b/pdns/saxfr.cc @@ -183,7 +183,7 @@ try o<<"\t"<first.d_content->getZoneRepresentation(); } - records.push_back(make_pair(i->first.d_name,o.str())); + records.emplace_back(i->first.d_name, o.str()); DNSName shorter(i->first.d_name); do { diff --git a/pdns/sdig.cc b/pdns/sdig.cc index 8188a9e49521..6e9d77635b61 100644 --- a/pdns/sdig.cc +++ b/pdns/sdig.cc @@ -75,8 +75,7 @@ static void fillPacket(vector& packet, const string& q, const string& t if (ednsnm) { EDNSSubnetOpts eo; eo.source = *ednsnm; - opts.push_back( - make_pair(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(eo))); + opts.emplace_back(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(eo)); } pw.addOpt(bufsize, 0, dnssec ? EDNSOpts::DNSSECOK : 0, opts); @@ -364,10 +363,10 @@ try { while (getline(std::cin, line)) { auto fields = splitField(line, ' '); - questions.push_back(make_pair(fields.first, fields.second)); + questions.emplace_back(fields.first, fields.second); } } else { - questions.push_back(make_pair(name, type)); + questions.emplace_back(name, type); } if (doh) { @@ -378,8 +377,8 @@ try { xpfproto, xpfsrc, xpfdst, qclass, opcode, 0); MiniCurl mc; MiniCurl::MiniCurlHeaders mch; - mch.insert(std::make_pair("Content-Type", "application/dns-message")); - mch.insert(std::make_pair("Accept", "application/dns-message")); + mch.emplace("Content-Type", "application/dns-message"); + mch.emplace("Accept", "application/dns-message"); string question(packet.begin(), packet.end()); // FIXME: how do we use proxyheader here? reply = mc.postURL(argv[1], question, mch, timeout.tv_sec, fastOpen); diff --git a/pdns/slavecommunicator.cc b/pdns/slavecommunicator.cc index 3322e2763fb9..79b0d3955097 100644 --- a/pdns/slavecommunicator.cc +++ b/pdns/slavecommunicator.cc @@ -1056,7 +1056,7 @@ vector > CommunicatorClass::getSuckRequests() { auto data = d_data.lock(); ret.reserve(data->d_suckdomains.size()); for (auto const &d : data->d_suckdomains) { - ret.push_back(make_pair(d.domain, d.master)); + ret.emplace_back(d.domain, d.master); } return ret; } diff --git a/pdns/sodiumsigners.cc b/pdns/sodiumsigners.cc index d33eb20ec37b..8c015da1e8b0 100644 --- a/pdns/sodiumsigners.cc +++ b/pdns/sodiumsigners.cc @@ -58,10 +58,10 @@ DNSCryptoKeyEngine::storvector_t SodiumED25519DNSCryptoKeyEngine::convertToISCVe storvector_t storvector; string algorithm = "15 (ED25519)"; - storvector.push_back(make_pair("Algorithm", algorithm)); + storvector.emplace_back("Algorithm", algorithm); vector buffer; - storvector.push_back(make_pair("PrivateKey", string((char*)d_seckey, crypto_sign_ed25519_SEEDBYTES))); + storvector.emplace_back("PrivateKey", string((char*)d_seckey, crypto_sign_ed25519_SEEDBYTES)); return storvector; } diff --git a/pdns/statbag.cc b/pdns/statbag.cc index 4e9f70bd469a..46066d2ca076 100644 --- a/pdns/statbag.cc +++ b/pdns/statbag.cc @@ -268,12 +268,12 @@ vector > StatBag::getRing(const string &name) typedef pair stor_t; vector raw =d_comboRings[name].lock()->get(); for(const stor_t& stor : raw) { - ret.push_back(make_pair(stor.first.ca.toString(), stor.second)); + ret.emplace_back(stor.first.ca.toString(), stor.second); } } else if (d_dnsnameqtyperings.count(name)) { auto raw = d_dnsnameqtyperings[name].lock()->get(); for (auto const &e : raw) { - ret.push_back(make_pair(std::get<0>(e.first).toLogString() + "/" + std::get<1>(e.first).toString(), e.second)); + ret.emplace_back(std::get<0>(e.first).toLogString() + "/" + std::get<1>(e.first).toString(), e.second); } } return ret; diff --git a/pdns/syncres.cc b/pdns/syncres.cc index 7d473e09829d..e962cf7fea1f 100644 --- a/pdns/syncres.cc +++ b/pdns/syncres.cc @@ -204,16 +204,16 @@ bool SyncRes::doSpecialNamesResolve(const DNSName &qname, const QType qtype, con qclass == QClass::IN) { handled = true; if (qtype == QType::PTR || qtype == QType::ANY) - answers.push_back({QType::PTR, "localhost."}); + answers.emplace_back(QType::PTR, "localhost."); } if (qname.isPartOf(localhost) && qclass == QClass::IN) { handled = true; if (qtype == QType::A || qtype == QType::ANY) - answers.push_back({QType::A, "127.0.0.1"}); + answers.emplace_back(QType::A, "127.0.0.1"); if (qtype == QType::AAAA || qtype == QType::ANY) - answers.push_back({QType::AAAA, "::1"}); + answers.emplace_back(QType::AAAA, "::1"); } if ((qname == versionbind || qname == idserver || qname == versionpdns) && @@ -221,9 +221,9 @@ bool SyncRes::doSpecialNamesResolve(const DNSName &qname, const QType qtype, con handled = true; if (qtype == QType::TXT || qtype == QType::ANY) { if(qname == versionbind || qname == versionpdns) - answers.push_back({QType::TXT, "\""+::arg()["version-string"]+"\""}); + answers.emplace_back(QType::TXT, "\"" + ::arg()["version-string"] + "\""); else if (s_serverID != "disabled") - answers.push_back({QType::TXT, "\""+s_serverID+"\""}); + answers.emplace_back(QType::TXT, "\"" + s_serverID + "\""); } } @@ -241,7 +241,7 @@ bool SyncRes::doSpecialNamesResolve(const DNSName &qname, const QType qtype, con ans<(dr)) { - answer.bestns.insert(make_pair(dr.d_name, nsContent->getNS())); + answer.bestns.emplace(dr.d_name, nsContent->getNS()); } } @@ -1976,7 +1976,7 @@ inline std::vector> SyncRes::shuffleInSpeedOrder(NsSet rnameservers.reserve(tnameservers.size()); for(const auto& tns: tnameservers) { float speed = t_sstorage.nsSpeeds[tns.first].get(d_now); - rnameservers.push_back({tns.first, speed}); + rnameservers.emplace_back(tns.first, speed); if(tns.first.empty()) // this was an authoritative OOB zone, don't pollute the nsSpeeds with that return rnameservers; } diff --git a/pdns/test-dnsdist_cc.cc b/pdns/test-dnsdist_cc.cc index 17944d0f50ff..8bf0e99b26c5 100644 --- a/pdns/test-dnsdist_cc.cc +++ b/pdns/test-dnsdist_cc.cc @@ -488,7 +488,7 @@ BOOST_AUTO_TEST_CASE(replaceECSWithSameSize) { ecsOpts.source = Netmask(origRemote, ECSSourcePrefixV4); string origECSOption = makeEDNSSubnetOptsString(ecsOpts); GenericDNSPacketWriter::optvect_t opts; - opts.push_back(make_pair(EDNSOptionCode::ECS, origECSOption)); + opts.emplace_back(EDNSOptionCode::ECS, origECSOption); pw.addOpt(512, 0, 0, opts); pw.commit(); @@ -523,7 +523,7 @@ BOOST_AUTO_TEST_CASE(replaceECSWithSameSizeAlreadyParsed) { ecsOpts.source = Netmask(origRemote, ECSSourcePrefixV4); string origECSOption = makeEDNSSubnetOptsString(ecsOpts); GenericDNSPacketWriter::optvect_t opts; - opts.push_back(make_pair(EDNSOptionCode::ECS, origECSOption)); + opts.emplace_back(EDNSOptionCode::ECS, origECSOption); pw.addOpt(512, 0, 0, opts); pw.commit(); @@ -568,7 +568,7 @@ BOOST_AUTO_TEST_CASE(replaceECSWithSmaller) { ecsOpts.source = Netmask(origRemote, 32); string origECSOption = makeEDNSSubnetOptsString(ecsOpts); GenericDNSPacketWriter::optvect_t opts; - opts.push_back(make_pair(EDNSOptionCode::ECS, origECSOption)); + opts.emplace_back(EDNSOptionCode::ECS, origECSOption); pw.addOpt(512, 0, 0, opts); pw.commit(); @@ -606,7 +606,7 @@ BOOST_AUTO_TEST_CASE(replaceECSWithLarger) { ecsOpts.source = Netmask(origRemote, 8); string origECSOption = makeEDNSSubnetOptsString(ecsOpts); GenericDNSPacketWriter::optvect_t opts; - opts.push_back(make_pair(EDNSOptionCode::ECS, origECSOption)); + opts.emplace_back(EDNSOptionCode::ECS, origECSOption); pw.addOpt(512, 0, 0, opts); pw.commit(); @@ -659,7 +659,7 @@ BOOST_AUTO_TEST_CASE(replaceECSFollowedByTSIG) { ecsOpts.source = Netmask(origRemote, 8); string origECSOption = makeEDNSSubnetOptsString(ecsOpts); GenericDNSPacketWriter::optvect_t opts; - opts.push_back(make_pair(EDNSOptionCode::ECS, origECSOption)); + opts.emplace_back(EDNSOptionCode::ECS, origECSOption); pw.addOpt(512, 0, 0, opts); pw.startRecord(DNSName("tsigname."), QType::TSIG, 0, QClass::ANY, DNSResourceRecord::ADDITIONAL, false); pw.commit(); @@ -715,7 +715,7 @@ BOOST_AUTO_TEST_CASE(replaceECSAfterAN) { ecsOpts.source = Netmask(origRemote, 8); string origECSOption = makeEDNSSubnetOptsString(ecsOpts); GenericDNSPacketWriter::optvect_t opts; - opts.push_back(make_pair(EDNSOptionCode::ECS, origECSOption)); + opts.emplace_back(EDNSOptionCode::ECS, origECSOption); pw.addOpt(512, 0, 0, opts); pw.commit(); @@ -770,7 +770,7 @@ BOOST_AUTO_TEST_CASE(replaceECSAfterAuth) { ecsOpts.source = Netmask(origRemote, 8); string origECSOption = makeEDNSSubnetOptsString(ecsOpts); GenericDNSPacketWriter::optvect_t opts; - opts.push_back(make_pair(EDNSOptionCode::ECS, origECSOption)); + opts.emplace_back(EDNSOptionCode::ECS, origECSOption); pw.addOpt(512, 0, 0, opts); pw.commit(); @@ -823,7 +823,7 @@ BOOST_AUTO_TEST_CASE(replaceECSBetweenTwoRecords) { ecsOpts.source = Netmask(origRemote, 8); string origECSOption = makeEDNSSubnetOptsString(ecsOpts); GenericDNSPacketWriter::optvect_t opts; - opts.push_back(make_pair(EDNSOptionCode::ECS, origECSOption)); + opts.emplace_back(EDNSOptionCode::ECS, origECSOption); pw.startRecord(DNSName("additional"), QType::A, 0, QClass::IN, DNSResourceRecord::ADDITIONAL, false); pw.xfr32BitInt(0x01020304); pw.addOpt(512, 0, 0, opts); @@ -1074,7 +1074,7 @@ BOOST_AUTO_TEST_CASE(removeECSWhenOnlyOption) { ecsOpts.source = Netmask(origRemote, ECSSourcePrefixV4); string origECSOptionStr = makeEDNSSubnetOptsString(ecsOpts); GenericDNSPacketWriter::optvect_t opts; - opts.push_back(make_pair(EDNSOptionCode::ECS, origECSOptionStr)); + opts.emplace_back(EDNSOptionCode::ECS, origECSOptionStr); pw.addOpt(512, 0, 0, opts); pw.commit(); @@ -1123,8 +1123,8 @@ BOOST_AUTO_TEST_CASE(removeECSWhenFirstOption) { EDNSCookiesOpt cookiesOpt("deadbeefdeadbeef"); string cookiesOptionStr = cookiesOpt.makeOptString(); GenericDNSPacketWriter::optvect_t opts; - opts.push_back(make_pair(EDNSOptionCode::ECS, origECSOptionStr)); - opts.push_back(make_pair(EDNSOptionCode::COOKIE, cookiesOptionStr)); + opts.emplace_back(EDNSOptionCode::ECS, origECSOptionStr); + opts.emplace_back(EDNSOptionCode::COOKIE, cookiesOptionStr); pw.addOpt(512, 0, 0, opts); pw.commit(); @@ -1176,9 +1176,9 @@ BOOST_AUTO_TEST_CASE(removeECSWhenIntermediaryOption) { string cookiesOptionStr2 = cookiesOpt.makeOptString(); GenericDNSPacketWriter::optvect_t opts; - opts.push_back(make_pair(EDNSOptionCode::COOKIE, cookiesOptionStr1)); - opts.push_back(make_pair(EDNSOptionCode::ECS, origECSOptionStr)); - opts.push_back(make_pair(EDNSOptionCode::COOKIE, cookiesOptionStr2)); + opts.emplace_back(EDNSOptionCode::COOKIE, cookiesOptionStr1); + opts.emplace_back(EDNSOptionCode::ECS, origECSOptionStr); + opts.emplace_back(EDNSOptionCode::COOKIE, cookiesOptionStr2); pw.addOpt(512, 0, 0, opts); pw.commit(); @@ -1227,8 +1227,8 @@ BOOST_AUTO_TEST_CASE(removeECSWhenLastOption) { ecsOpts.source = Netmask(origRemote, ECSSourcePrefixV4); string origECSOptionStr = makeEDNSSubnetOptsString(ecsOpts); GenericDNSPacketWriter::optvect_t opts; - opts.push_back(make_pair(EDNSOptionCode::COOKIE, cookiesOptionStr)); - opts.push_back(make_pair(EDNSOptionCode::ECS, origECSOptionStr)); + opts.emplace_back(EDNSOptionCode::COOKIE, cookiesOptionStr); + opts.emplace_back(EDNSOptionCode::ECS, origECSOptionStr); pw.addOpt(512, 0, 0, opts); pw.commit(); @@ -1271,7 +1271,7 @@ BOOST_AUTO_TEST_CASE(rewritingWithoutECSWhenOnlyOption) { ecsOpts.source = Netmask(origRemote, ECSSourcePrefixV4); string origECSOptionStr = makeEDNSSubnetOptsString(ecsOpts); GenericDNSPacketWriter::optvect_t opts; - opts.push_back(make_pair(EDNSOptionCode::ECS, origECSOptionStr)); + opts.emplace_back(EDNSOptionCode::ECS, origECSOptionStr); pw.addOpt(512, 0, 0, opts); pw.commit(); @@ -1310,8 +1310,8 @@ BOOST_AUTO_TEST_CASE(rewritingWithoutECSWhenFirstOption) { EDNSCookiesOpt cookiesOpt("deadbeefdeadbeef"); string cookiesOptionStr = cookiesOpt.makeOptString(); GenericDNSPacketWriter::optvect_t opts; - opts.push_back(make_pair(EDNSOptionCode::ECS, origECSOptionStr)); - opts.push_back(make_pair(EDNSOptionCode::COOKIE, cookiesOptionStr)); + opts.emplace_back(EDNSOptionCode::ECS, origECSOptionStr); + opts.emplace_back(EDNSOptionCode::COOKIE, cookiesOptionStr); pw.addOpt(512, 0, 0, opts); pw.commit(); @@ -1351,9 +1351,9 @@ BOOST_AUTO_TEST_CASE(rewritingWithoutECSWhenIntermediaryOption) { string cookiesOptionStr1 = cookiesOpt.makeOptString(); string cookiesOptionStr2 = cookiesOpt.makeOptString(); GenericDNSPacketWriter::optvect_t opts; - opts.push_back(make_pair(EDNSOptionCode::COOKIE, cookiesOptionStr1)); - opts.push_back(make_pair(EDNSOptionCode::ECS, origECSOptionStr)); - opts.push_back(make_pair(EDNSOptionCode::COOKIE, cookiesOptionStr2)); + opts.emplace_back(EDNSOptionCode::COOKIE, cookiesOptionStr1); + opts.emplace_back(EDNSOptionCode::ECS, origECSOptionStr); + opts.emplace_back(EDNSOptionCode::COOKIE, cookiesOptionStr2); pw.addOpt(512, 0, 0, opts); pw.commit(); @@ -1392,8 +1392,8 @@ BOOST_AUTO_TEST_CASE(rewritingWithoutECSWhenLastOption) { EDNSCookiesOpt cookiesOpt("deadbeefdeadbeef"); string cookiesOptionStr = cookiesOpt.makeOptString(); GenericDNSPacketWriter::optvect_t opts; - opts.push_back(make_pair(EDNSOptionCode::COOKIE, cookiesOptionStr)); - opts.push_back(make_pair(EDNSOptionCode::ECS, origECSOptionStr)); + opts.emplace_back(EDNSOptionCode::COOKIE, cookiesOptionStr); + opts.emplace_back(EDNSOptionCode::ECS, origECSOptionStr); pw.addOpt(512, 0, 0, opts); pw.commit(); @@ -1458,8 +1458,8 @@ BOOST_AUTO_TEST_CASE(test_getEDNSZ) { EDNSCookiesOpt cookiesOpt("deadbeefdeadbeef"); string cookiesOptionStr = cookiesOpt.makeOptString(); GenericDNSPacketWriter::optvect_t opts; - opts.push_back(make_pair(EDNSOptionCode::COOKIE, cookiesOptionStr)); - opts.push_back(make_pair(EDNSOptionCode::ECS, origECSOptionStr)); + opts.emplace_back(EDNSOptionCode::COOKIE, cookiesOptionStr); + opts.emplace_back(EDNSOptionCode::ECS, origECSOptionStr); { /* no EDNS */ @@ -1554,8 +1554,8 @@ BOOST_AUTO_TEST_CASE(test_addEDNSToQueryTurnedResponse) { EDNSCookiesOpt cookiesOpt("deadbeefdeadbeef"); string cookiesOptionStr = cookiesOpt.makeOptString(); GenericDNSPacketWriter::optvect_t opts; - opts.push_back(make_pair(EDNSOptionCode::COOKIE, cookiesOptionStr)); - opts.push_back(make_pair(EDNSOptionCode::ECS, origECSOptionStr)); + opts.emplace_back(EDNSOptionCode::COOKIE, cookiesOptionStr); + opts.emplace_back(EDNSOptionCode::ECS, origECSOptionStr); ComboAddress lc("127.0.0.1"); ComboAddress rem("127.0.0.1"); struct timespec queryRealTime; @@ -1656,7 +1656,7 @@ BOOST_AUTO_TEST_CASE(test_getEDNSOptionsStart) { ecsOpts.source = Netmask(ComboAddress("127.0.0.1"), ECSSourcePrefixV4); const string ecsOptionStr = makeEDNSSubnetOptsString(ecsOpts); GenericDNSPacketWriter::optvect_t opts; - opts.push_back(make_pair(EDNSOptionCode::ECS, ecsOptionStr)); + opts.emplace_back(EDNSOptionCode::ECS, ecsOptionStr); const ComboAddress lc("127.0.0.1"); const ComboAddress rem("127.0.0.1"); uint16_t optRDPosition; @@ -1763,9 +1763,9 @@ BOOST_AUTO_TEST_CASE(test_isEDNSOptionInOpt) { const size_t sizeOfCookieOption = /* option code */ 2 + /* option length */ 2 + cookiesOpt.size(); /* GenericDNSPacketWriter::optvect_t opts; - opts.push_back(make_pair(EDNSOptionCode::COOKIE, cookiesOptionStr)); - opts.push_back(make_pair(EDNSOptionCode::ECS, ecsOptionStr)); - opts.push_back(make_pair(EDNSOptionCode::COOKIE, cookiesOptionStr)); + opts.emplace_back(EDNSOptionCode::COOKIE, cookiesOptionStr); + opts.emplace_back(EDNSOptionCode::ECS, ecsOptionStr); + opts.emplace_back(EDNSOptionCode::COOKIE, cookiesOptionStr); */ const ComboAddress lc("127.0.0.1"); const ComboAddress rem("127.0.0.1"); @@ -1811,8 +1811,8 @@ BOOST_AUTO_TEST_CASE(test_isEDNSOptionInOpt) { PacketBuffer query; GenericDNSPacketWriter pw(query, qname, qtype, qclass, 0); GenericDNSPacketWriter::optvect_t opts; - opts.push_back(make_pair(EDNSOptionCode::COOKIE, cookiesOptionStr)); - opts.push_back(make_pair(EDNSOptionCode::COOKIE, cookiesOptionStr)); + opts.emplace_back(EDNSOptionCode::COOKIE, cookiesOptionStr); + opts.emplace_back(EDNSOptionCode::COOKIE, cookiesOptionStr); pw.addOpt(512, 0, 0, opts); pw.commit(); @@ -1829,8 +1829,8 @@ BOOST_AUTO_TEST_CASE(test_isEDNSOptionInOpt) { PacketBuffer query; GenericDNSPacketWriter pw(query, qname, qtype, qclass, 0); GenericDNSPacketWriter::optvect_t opts; - opts.push_back(make_pair(EDNSOptionCode::ECS, ecsOptionStr)); - opts.push_back(make_pair(EDNSOptionCode::ECS, ecsOptionStr)); + opts.emplace_back(EDNSOptionCode::ECS, ecsOptionStr); + opts.emplace_back(EDNSOptionCode::ECS, ecsOptionStr); pw.addOpt(512, 0, 0, opts); pw.commit(); @@ -1851,9 +1851,9 @@ BOOST_AUTO_TEST_CASE(test_isEDNSOptionInOpt) { PacketBuffer query; GenericDNSPacketWriter pw(query, qname, qtype, qclass, 0); GenericDNSPacketWriter::optvect_t opts; - opts.push_back(make_pair(EDNSOptionCode::COOKIE, cookiesOptionStr)); - opts.push_back(make_pair(EDNSOptionCode::ECS, ecsOptionStr)); - opts.push_back(make_pair(EDNSOptionCode::COOKIE, cookiesOptionStr)); + opts.emplace_back(EDNSOptionCode::COOKIE, cookiesOptionStr); + opts.emplace_back(EDNSOptionCode::ECS, ecsOptionStr); + opts.emplace_back(EDNSOptionCode::COOKIE, cookiesOptionStr); pw.addOpt(512, 0, 0, opts); pw.commit(); @@ -1874,8 +1874,8 @@ BOOST_AUTO_TEST_CASE(test_isEDNSOptionInOpt) { PacketBuffer query; GenericDNSPacketWriter pw(query, qname, qtype, qclass, 0); GenericDNSPacketWriter::optvect_t opts; - opts.push_back(make_pair(EDNSOptionCode::ECS, ecsOptionStr)); - opts.push_back(make_pair(65535, cookiesOptionStr)); + opts.emplace_back(EDNSOptionCode::ECS, ecsOptionStr); + opts.emplace_back(65535, cookiesOptionStr); pw.addOpt(512, 0, 0, opts); pw.commit(); diff --git a/pdns/test-dnsdistpacketcache_cc.cc b/pdns/test-dnsdistpacketcache_cc.cc index 7af31fa110aa..4be01c2fcf1a 100644 --- a/pdns/test-dnsdistpacketcache_cc.cc +++ b/pdns/test-dnsdistpacketcache_cc.cc @@ -569,7 +569,7 @@ BOOST_AUTO_TEST_CASE(test_PCCollision) { GenericDNSPacketWriter::optvect_t ednsOptions; EDNSSubnetOpts opt; opt.source = Netmask("10.0.59.220/32"); - ednsOptions.push_back(std::make_pair(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt))); + ednsOptions.emplace_back(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt)); pwQ.addOpt(512, 0, 0, ednsOptions); pwQ.commit(); @@ -612,7 +612,7 @@ BOOST_AUTO_TEST_CASE(test_PCCollision) { GenericDNSPacketWriter::optvect_t ednsOptions; EDNSSubnetOpts opt; opt.source = Netmask("10.0.167.48/32"); - ednsOptions.push_back(std::make_pair(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt))); + ednsOptions.emplace_back(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt)); pwQ.addOpt(512, 0, 0, ednsOptions); pwQ.commit(); @@ -649,11 +649,11 @@ BOOST_AUTO_TEST_CASE(test_PCCollision) { pwFQ.getHeader()->id = 0x42; opt.source = Netmask("10." + std::to_string(idxA) + "." + std::to_string(idxB) + "." + std::to_string(idxC) + "/32"); ednsOptions.clear(); - ednsOptions.push_back(std::make_pair(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt))); + ednsOptions.emplace_back(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt)); pwFQ.addOpt(512, 0, 0, ednsOptions); pwFQ.commit(); secondKey = pc.getKey(qname.toDNSString(), qname.wirelength(), secondQuery, false); - auto pair = colMap.insert(std::make_pair(secondKey, opt.source)); + auto pair = colMap.emplace(secondKey, opt.source); total++; if (!pair.second) { collisions++; diff --git a/pdns/test-dnsrecords_cc.cc b/pdns/test-dnsrecords_cc.cc index 6c66cb2312c4..9079c6ed5779 100644 --- a/pdns/test-dnsrecords_cc.cc +++ b/pdns/test-dnsrecords_cc.cc @@ -444,7 +444,7 @@ BOOST_AUTO_TEST_CASE(test_opt_record_out) { DNSPacketWriter pw(pak, DNSName("www.powerdns.com"), QType::A); pw.startRecord(DNSName("www.powerdns.com"), QType::A, 16, 1, DNSResourceRecord::ANSWER); pw.xfrIP(htonl(0x7f000001)); - opts.push_back(pair(3, "powerdns")); + opts.emplace_back(3, "powerdns"); pw.addOpt(1280, 0, 0, opts); pw.getHeader()->id = htons(0xf001); pw.getHeader()->rd = 1; diff --git a/pdns/test-misc_hh.cc b/pdns/test-misc_hh.cc index 0f591bcfd7fa..248ef8d61168 100644 --- a/pdns/test-misc_hh.cc +++ b/pdns/test-misc_hh.cc @@ -40,15 +40,15 @@ BOOST_AUTO_TEST_CASE(test_CIStringCompare) { BOOST_AUTO_TEST_CASE(test_CIStringPairCompare) { set nsset2; - nsset2.insert(make_pair("ns.example.com", 1)); - nsset2.insert(make_pair("abc", 1)); - nsset2.insert(make_pair("", 1)); - nsset2.insert(make_pair("def", 1)); - nsset2.insert(make_pair("abc", 2)); - nsset2.insert(make_pair("abc", 1)); - nsset2.insert(make_pair("ns.example.com", 0)); - nsset2.insert(make_pair("abc", 2)); - nsset2.insert(make_pair("ABC", 2)); + nsset2.emplace("ns.example.com", 1); + nsset2.emplace("abc", 1); + nsset2.emplace("", 1); + nsset2.emplace("def", 1); + nsset2.emplace("abc", 2); + nsset2.emplace("abc", 1); + nsset2.emplace("ns.example.com", 0); + nsset2.emplace("abc", 2); + nsset2.emplace("ABC", 2); BOOST_CHECK_EQUAL(nsset2.size(), 6U); ostringstream s; diff --git a/pdns/test-packetcache_cc.cc b/pdns/test-packetcache_cc.cc index 5fcfff8216aa..4b3a39936a1e 100644 --- a/pdns/test-packetcache_cc.cc +++ b/pdns/test-packetcache_cc.cc @@ -347,7 +347,7 @@ BOOST_AUTO_TEST_CASE(test_AuthPacketCache) { { ecsOpts.source = Netmask(ComboAddress("192.0.2.1"), 32); - opts.push_back(make_pair(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(ecsOpts))); + opts.emplace_back(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(ecsOpts)); DNSPacketWriter pw(pak, DNSName("www.powerdns.com"), QType::A); pw.addOpt(512, 0, 0, opts); pw.commit(); @@ -359,7 +359,7 @@ BOOST_AUTO_TEST_CASE(test_AuthPacketCache) { { DNSPacketWriter pw(pak, DNSName("www.powerdns.com"), QType::A); ecsOpts.source = Netmask(ComboAddress("192.0.2.2"), 32); - opts.push_back(make_pair(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(ecsOpts))); + opts.emplace_back(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(ecsOpts)); pw.addOpt(512, 0, 0, opts); pw.commit(); ecs2.parse((char*)&pak[0], pak.size()); @@ -370,7 +370,7 @@ BOOST_AUTO_TEST_CASE(test_AuthPacketCache) { { DNSPacketWriter pw(pak, DNSName("www.powerdns.com"), QType::A); ecsOpts.source = Netmask(ComboAddress("192.0.2.3"), 16); - opts.push_back(make_pair(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(ecsOpts))); + opts.emplace_back(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(ecsOpts)); pw.addOpt(512, 0, 0, opts); pw.commit(); ecs3.parse((char*)&pak[0], pak.size()); diff --git a/pdns/test-packetcache_hh.cc b/pdns/test-packetcache_hh.cc index 4914b055219e..1e361a7fa66e 100644 --- a/pdns/test-packetcache_hh.cc +++ b/pdns/test-packetcache_hh.cc @@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE(test_PacketCacheAuthCollision) { pw1.getHeader()->id = 0x42; opt.source = Netmask("10.0.152.74/32"); ednsOptions.clear(); - ednsOptions.push_back(std::make_pair(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt))); + ednsOptions.emplace_back(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt)); pw1.addOpt(512, 0, 0, ednsOptions); pw1.commit(); @@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE(test_PacketCacheAuthCollision) { pw2.getHeader()->id = 0x84; opt.source = Netmask("10.2.70.250/32"); ednsOptions.clear(); - ednsOptions.push_back(std::make_pair(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt))); + ednsOptions.emplace_back(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt)); pw2.addOpt(512, 0, 0, ednsOptions); pw2.commit(); @@ -97,11 +97,11 @@ BOOST_AUTO_TEST_CASE(test_PacketCacheAuthCollision) { pwFQ.getHeader()->id = 0x42; opt.source = Netmask("10." + std::to_string(idxA) + "." + std::to_string(idxB) + "." + std::to_string(idxC) + "/32"); ednsOptions.clear(); - ednsOptions.push_back(std::make_pair(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt))); + ednsOptions.emplace_back(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt)); pwFQ.addOpt(512, 0, 0, ednsOptions); pwFQ.commit(); auto secondKey = PacketCache::canHashPacket(std::string(reinterpret_cast(secondQuery.data()), secondQuery.size()), optionsToSkip); - auto pair = colMap.insert(std::make_pair(secondKey, opt.source)); + auto pair = colMap.emplace(secondKey, opt.source); total++; if (!pair.second) { collisions++; @@ -127,7 +127,7 @@ BOOST_AUTO_TEST_CASE(test_PacketCacheAuthCollision) { pw1.getHeader()->id = 0x42; opt.source = Netmask("10.0.34.159/32"); ednsOptions.clear(); - ednsOptions.push_back(std::make_pair(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt))); + ednsOptions.emplace_back(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt)); pw1.addOpt(512, 0, EDNSOpts::DNSSECOK, ednsOptions); pw1.commit(); @@ -141,7 +141,7 @@ BOOST_AUTO_TEST_CASE(test_PacketCacheAuthCollision) { pw2.getHeader()->id = 0x84; opt.source = Netmask("10.0.179.58/32"); ednsOptions.clear(); - ednsOptions.push_back(std::make_pair(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt))); + ednsOptions.emplace_back(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt)); /* no EDNSOpts::DNSSECOK !! */ pw2.addOpt(512, 0, 0, ednsOptions); pw2.commit(); @@ -163,9 +163,9 @@ BOOST_AUTO_TEST_CASE(test_PacketCacheAuthCollision) { pw1.getHeader()->id = 0x42; opt.source = Netmask("192.0.2.1/32"); ednsOptions.clear(); - ednsOptions.push_back(std::make_pair(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt))); + ednsOptions.emplace_back(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt)); EDNSCookiesOpt cookiesOpt(string("deadbeefdeadbeef")); - ednsOptions.push_back(std::make_pair(EDNSOptionCode::COOKIE, cookiesOpt.makeOptString())); + ednsOptions.emplace_back(EDNSOptionCode::COOKIE, cookiesOpt.makeOptString()); pw1.addOpt(512, 0, EDNSOpts::DNSSECOK, ednsOptions); pw1.commit(); @@ -179,9 +179,9 @@ BOOST_AUTO_TEST_CASE(test_PacketCacheAuthCollision) { pw2.getHeader()->id = 0x84; opt.source = Netmask("192.0.2.1/32"); ednsOptions.clear(); - ednsOptions.push_back(std::make_pair(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt))); + ednsOptions.emplace_back(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt)); cookiesOpt.makeFromString(string("deadbeefbadc0fee")); - ednsOptions.push_back(std::make_pair(EDNSOptionCode::COOKIE, cookiesOpt.makeOptString())); + ednsOptions.emplace_back(EDNSOptionCode::COOKIE, cookiesOpt.makeOptString()); pw2.addOpt(512, 0, EDNSOpts::DNSSECOK, ednsOptions); pw2.commit(); @@ -211,11 +211,11 @@ BOOST_AUTO_TEST_CASE(test_PacketCacheAuthCollision) { pwFQ.getHeader()->id = 0x42; opt.source = Netmask("10." + std::to_string(idxA) + "." + std::to_string(idxB) + "." + std::to_string(idxC) + "/32"); ednsOptions.clear(); - ednsOptions.push_back(std::make_pair(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt))); + ednsOptions.emplace_back(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt)); pwFQ.addOpt(512, 0, 32768, ednsOptions); pwFQ.commit(); auto secondKey = PacketCache::canHashPacket(std::string(reinterpret_cast(secondQuery.data()), secondQuery.size()), optionsToSkip); - colMap.insert(std::make_pair(secondKey, opt.source)); + colMap.emplace(secondKey, opt.source); secondQuery.clear(); DNSPacketWriter pwSQ(secondQuery, qname, QType::AAAA, QClass::IN, 0); @@ -224,7 +224,7 @@ BOOST_AUTO_TEST_CASE(test_PacketCacheAuthCollision) { pwSQ.getHeader()->id = 0x42; opt.source = Netmask("10." + std::to_string(idxA) + "." + std::to_string(idxB) + "." + std::to_string(idxC) + "/32"); ednsOptions.clear(); - ednsOptions.push_back(std::make_pair(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt))); + ednsOptions.emplace_back(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt)); pwSQ.addOpt(512, 0, 0, ednsOptions); pwSQ.commit(); secondKey = PacketCache::canHashPacket(std::string(reinterpret_cast(secondQuery.data()), secondQuery.size()), optionsToSkip); @@ -314,7 +314,7 @@ BOOST_AUTO_TEST_CASE(test_PacketCacheRecCollision) { pw1.getHeader()->id = 0x42; opt.source = Netmask("10.0.18.199/32"); ednsOptions.clear(); - ednsOptions.push_back(std::make_pair(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt))); + ednsOptions.emplace_back(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt)); pw1.addOpt(512, 0, 0, ednsOptions); pw1.commit(); @@ -328,7 +328,7 @@ BOOST_AUTO_TEST_CASE(test_PacketCacheRecCollision) { pw2.getHeader()->id = 0x84; opt.source = Netmask("10.0.131.66/32"); ednsOptions.clear(); - ednsOptions.push_back(std::make_pair(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt))); + ednsOptions.emplace_back(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt)); pw2.addOpt(512, 0, 0, ednsOptions); pw2.commit(); @@ -349,9 +349,9 @@ BOOST_AUTO_TEST_CASE(test_PacketCacheRecCollision) { pw1.getHeader()->id = 0x42; opt.source = Netmask("192.0.2.1/32"); ednsOptions.clear(); - ednsOptions.push_back(std::make_pair(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt))); + ednsOptions.emplace_back(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt)); EDNSCookiesOpt cookiesOpt(string("deadbeefdead\x11\xee\x00\x00").c_str(), 16); - ednsOptions.push_back(std::make_pair(EDNSOptionCode::COOKIE, cookiesOpt.makeOptString())); + ednsOptions.emplace_back(EDNSOptionCode::COOKIE, cookiesOpt.makeOptString()); pw1.addOpt(512, 0, EDNSOpts::DNSSECOK, ednsOptions); pw1.commit(); @@ -365,9 +365,9 @@ BOOST_AUTO_TEST_CASE(test_PacketCacheRecCollision) { pw2.getHeader()->id = 0x84; opt.source = Netmask("192.0.2.1/32"); ednsOptions.clear(); - ednsOptions.push_back(std::make_pair(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt))); + ednsOptions.emplace_back(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(opt)); cookiesOpt.makeFromString(string("deadbeefdead\x67\x44\x00\x00").c_str(), 16); - ednsOptions.push_back(std::make_pair(EDNSOptionCode::COOKIE, cookiesOpt.makeOptString())); + ednsOptions.emplace_back(EDNSOptionCode::COOKIE, cookiesOpt.makeOptString()); pw2.addOpt(512, 0, EDNSOpts::DNSSECOK, ednsOptions); pw2.commit(); diff --git a/pdns/toysdig.cc b/pdns/toysdig.cc index b2e93c30a675..7247531e66a3 100644 --- a/pdns/toysdig.cc +++ b/pdns/toysdig.cc @@ -146,7 +146,7 @@ try cerr<<"got rrsig "<d_signer<<"/"<d_tag<d_signer, keys); cerr<<"! state = "< zones; (*i)->getAllDomains(&zones, false, true); for(auto& di: zones) { - zone_indices.push_back({std::move(di.zone), (int)di.id}); // this cast should not be necessary + zone_indices.emplace_back(std::move(di.zone), (int)di.id); // this cast should not be necessary } } g_zoneCache.replace(zone_indices); diff --git a/pdns/ws-recursor.cc b/pdns/ws-recursor.cc index 97b968d5ab50..7cd1b77a0168 100644 --- a/pdns/ws-recursor.cc +++ b/pdns/ws-recursor.cc @@ -53,7 +53,7 @@ void productServerStatisticsFetch(map& out) auto stats = getAllStatsMap(StatComponent::API); map ret; for (const auto& entry: stats) { - ret.insert(make_pair(entry.first, entry.second.d_value)); + ret.emplace(entry.first, entry.second.d_value); } out.swap(ret); } @@ -1197,7 +1197,7 @@ void RecursorWebServer::jsonstat(HttpRequest* req, HttpResponse *resp) rcounts_t rcounts; for(counts_t::const_iterator i=counts.begin(); i != counts.end(); ++i) - rcounts.insert(make_pair(-i->second, i->first)); + rcounts.emplace(-i->second, i->first); Json::array entries; unsigned int tot=0, totIncluded=0; @@ -1242,7 +1242,7 @@ void RecursorWebServer::jsonstat(HttpRequest* req, HttpResponse *resp) rcounts_t rcounts; for(counts_t::const_iterator i=counts.begin(); i != counts.end(); ++i) - rcounts.insert(make_pair(-i->second, i->first)); + rcounts.emplace(-i->second, i->first); Json::array entries; unsigned int tot=0, totIncluded=0;