Skip to content

Commit

Permalink
use some structured binding
Browse files Browse the repository at this point in the history
clang-tidy complains here about pointless std::move of a trivially
copyable type.

Signed-off-by: Rosen Penev <[email protected]>
  • Loading branch information
neheb committed Dec 19, 2024
1 parent fe75d35 commit cc8990a
Showing 1 changed file with 7 additions and 10 deletions.
17 changes: 7 additions & 10 deletions pdns/auth-zonecache.cc
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,13 @@ void AuthZoneCache::replace(const vector<std::tuple<DNSName, int>>& zone_indices
vector<cmap_t> newMaps(d_maps.size());

// build new maps
for (const std::tuple<DNSName, int>& tup : zone_indices) {
const DNSName& zone = std::get<0>(tup);
for (const auto& [zone, id] : zone_indices) {
CacheValue val;
val.zoneId = std::get<1>(tup);
val.zoneId = id;
auto& mc = newMaps[getMapIndex(zone)];
auto iter = mc.find(zone);
if (iter != mc.end()) {
iter->second = std::move(val);
iter->second = val;
}
else {
mc.emplace(zone, val);
Expand All @@ -101,16 +100,14 @@ void AuthZoneCache::replace(const vector<std::tuple<DNSName, int>>& zone_indices
// process zone updates done while data collection for replace() was already in progress.
auto pending = d_pending.lock();
assert(pending->d_replacePending); // make sure we never forget to call setReplacePending()
for (const std::tuple<DNSName, int, bool>& tup : pending->d_pendingUpdates) {
const DNSName& zone = std::get<0>(tup);
for (const auto& [zone, id, insert] : pending->d_pendingUpdates) {
CacheValue val;
val.zoneId = std::get<1>(tup);
bool insert = std::get<2>(tup);
val.zoneId = id;
auto& mc = newMaps[getMapIndex(zone)];
auto iter = mc.find(zone);
if (iter != mc.end()) {
if (insert) {
iter->second = std::move(val);
iter->second = val;
}
else {
mc.erase(iter);
Expand Down Expand Up @@ -157,7 +154,7 @@ void AuthZoneCache::add(const DNSName& zone, const int zoneId)
auto map = mc.d_map.write_lock();
auto iter = map->find(zone);
if (iter != map->end()) {
iter->second = std::move(val);
iter->second = val;
}
else {
map->emplace(zone, val);
Expand Down

0 comments on commit cc8990a

Please sign in to comment.