BIND 10 trac1551, updated. ab457a83d9ab58e722b84a7f99bd83dd49d75483 [1551] used a function instead of a functor object for "isNotNSEC".

[BIND 10 source code commits]

The branch, trac1551 has been updated
       via  ab457a83d9ab58e722b84a7f99bd83dd49d75483 (commit)
      from  ae0979752fd9062a5b184ec855c2f9eab1363aba (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ab457a83d9ab58e722b84a7f99bd83dd49d75483
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Thu Feb 2 13:08:59 2012 -0800

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

-----------------------------------------------------------------------

Summary of changes:
 src/lib/datasrc/memory_datasrc.cc |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory_datasrc.cc b/src/lib/datasrc/memory_datasrc.cc
index ddce599..7dad67e 100644
--- a/src/lib/datasrc/memory_datasrc.cc
+++ b/src/lib/datasrc/memory_datasrc.cc
@@ -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());