Commit ab457a83 authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

[1551] used a function instead of a functor object for "isNotNSEC".

parent ae097975
......@@ -172,11 +172,9 @@ struct InMemoryZoneFinder::InMemoryZoneFinderImpl {
// A helper predicate used in contextCheck() to check if a given domain
// name has a RRset of type different than NSEC.
struct IsNotNSEC {
bool operator()(const DomainPair& element) const {
return (element.second->getType() != RRType::NSEC());
}
};
static bool isNotNSEC(const DomainPair& element) {
return (element.second->getType() != RRType::NSEC());
}
/*
* Does some checks in context of the data that are already in the zone.
......@@ -190,7 +188,7 @@ struct InMemoryZoneFinder::InMemoryZoneFinderImpl {
// owner name except with NSEC, which is the only RR that can coexist
// with CNAME (and also RRSIG, which is handled separately)
if (rrset.getType() == RRType::CNAME()) {
if (find_if(domain.begin(), domain.end(), IsNotNSEC())
if (find_if(domain.begin(), domain.end(), isNotNSEC)
!= domain.end()) {
LOG_ERROR(logger, DATASRC_MEM_CNAME_TO_NONEMPTY).
arg(rrset.getName());
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment