BIND 10 trac80, updated. ebba59e8684bf93f5239461d6c0724ac291243b5 [trac80] Make it compile under g++

[BIND 10 source code commits]

The branch, trac80 has been updated
       via  ebba59e8684bf93f5239461d6c0724ac291243b5 (commit)
      from  674efef18dbc1a215af65b31b4b38e33f53a6387 (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 ebba59e8684bf93f5239461d6c0724ac291243b5
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Mon Mar 14 19:22:39 2011 +0100

    [trac80] Make it compile under g++
    
    It seems g++ doesn't like to pass objects defined inside a function as a
    template parameter somewhere. Taken out of the function.

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

Summary of changes:
 src/lib/datasrc/data_source.cc |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/data_source.cc b/src/lib/datasrc/data_source.cc
index ffb945e..c0da59b 100644
--- a/src/lib/datasrc/data_source.cc
+++ b/src/lib/datasrc/data_source.cc
@@ -49,20 +49,21 @@ using namespace isc::dns;
 using namespace isc::dns::rdata;
 
 namespace {
+
+struct MatchRRsetForType {
+    MatchRRsetForType(const RRType rrtype) : rrtype_(rrtype) {}
+    bool operator()(RRsetPtr rrset) {
+        return (rrset->getType() == rrtype_);
+    }
+    const RRType rrtype_;
+};
+
 // This is a helper to retrieve a specified RR type of RRset from RRsetList.
 // In our case the data source search logic should ensure that the class is
 // valid.  We use this find logic of our own so that we can support both
 // specific RR class queries (normal case) and class ANY queries.
 RRsetPtr
 findRRsetFromList(RRsetList& list, const RRType rrtype) {
-    struct MatchRRsetForType {
-        MatchRRsetForType(const RRType rrtype) : rrtype_(rrtype) {}
-        bool operator()(RRsetPtr rrset) {
-            return (rrset->getType() == rrtype_);
-        }
-        const RRType rrtype_;
-    };
-
     RRsetList::iterator it(find_if(list.begin(), list.end(),
                                    MatchRRsetForType(rrtype)));
     return (it != list.end() ? *it : RRsetPtr());