boost foreach

diff --git a/pdns/backends/gsql/gsqlbackend.cc b/pdns/backends/gsql/gsqlbackend.cc
index dcca1510777e2339218e36fb73c3d610e8bdb94f..1ed86bb47b14577a17c62fc6a050efb5e77d39cf 100644 (file)
--- a/pdns/backends/gsql/gsqlbackend.cc
+++ b/pdns/backends/gsql/gsqlbackend.cc
@@ -35,7 +35,6 @@
 #include "pdns/dnssecinfra.hh"
 #include <boost/algorithm/string.hpp>
 #include <sstream>
-#include <boost/foreach.hpp>
 #include <boost/format.hpp>
 #include <boost/scoped_ptr.hpp>
 
@@ -234,7 +233,7 @@ bool GSQLBackend::isMaster(const DNSName &domain, const string &ip)
     vector<string> masters;
     stringtok(masters, d_result[0][0], " ,\t");
 
-    BOOST_FOREACH(const string master, masters) {
+    for(const auto& master: masters) {
       const ComboAddress caMaster(master);
       if(ip == caMaster.toString())
         return true;
@@ -494,7 +493,7 @@ bool GSQLBackend::updateEmptyNonTerminals(uint32_t domain_id, const DNSName& zon
   }
   else
   {
-    for(auto &qname: erase) {
+    for(const auto& qname: erase) {
       try {
         d_deleteEmptyNonTerminalQuery_stmt->
           bind("domain_id", domain_id)->
@@ -509,7 +508,7 @@ bool GSQLBackend::updateEmptyNonTerminals(uint32_t domain_id, const DNSName& zon
     }
   }
 
-  for(auto &qname: insert) {
+  for(const auto& qname: insert) {
     try {
       d_insertEmptyNonTerminalQuery_stmt->
         bind("domain_id", domain_id)->
@@ -788,7 +787,7 @@ bool GSQLBackend::getDomainKeys(const DNSName& name, unsigned int kind, std::vec
     KeyData kd;
     while(d_ListDomainKeysQuery_stmt->hasNextRow()) {
       d_ListDomainKeysQuery_stmt->nextRow(row);
-      //~ BOOST_FOREACH(const std::string& val, row) {
+      //~ for(const auto& val: row) {
         //~ cerr<<"'"<<val<<"'"<<endl;
       //~ }
       kd.id = atoi(row[0].c_str());
@@ -811,7 +810,7 @@ void GSQLBackend::alsoNotifies(const DNSName &domain, set<string> *ips)
 {
   vector<string> meta;
   getDomainMetadata(domain, "ALSO-NOTIFY", meta);
-  BOOST_FOREACH(string& str, meta) {
+  for(const auto& str: meta) {
     ips->insert(str);
   }
 }
@@ -880,7 +879,7 @@ bool GSQLBackend::setDomainMetadata(const DNSName& name, const std::string& kind
       execute()->
       reset();
     if(!meta.empty()) {
-      BOOST_FOREACH(const std::string & value, meta) {
+      for(const auto& value: meta) {
          d_SetDomainMetadataQuery_stmt->
            bind("kind", kind)->
            bind("content", value)->
@@ -1078,7 +1077,7 @@ bool GSQLBackend::createSlaveDomain(const string &ip, const DNSName &domain, con
       if (!d_result.empty()) {
         // collect all IP addresses
         vector<string> tmp;
-        BOOST_FOREACH(SSqlStatement::row_t& row, d_result) {
+        for(const auto& row: d_result) {
           if (account == row[1])
             tmp.push_back(row[0]);
         }
@@ -1214,7 +1213,7 @@ bool GSQLBackend::replaceRRSet(uint32_t domain_id, const DNSName& qname, const Q
       throw PDNSException("GSQLBackend unable to delete comment: "+e.txtReason());
     }
   }
-  BOOST_FOREACH(const DNSResourceRecord& rr, rrset) {
+  for(const auto& rr: rrset) {
     feedRecord(rr);
   }
   
@@ -1276,17 +1275,14 @@ bool GSQLBackend::feedRecord(const DNSResourceRecord &r, string *ordername)
 
 bool GSQLBackend::feedEnts(int domain_id, map<DNSName,bool>& nonterm)
 {
-  string query;
-  pair<DNSName,bool> nt;
-
-  BOOST_FOREACH(nt, nonterm) {
+  for(const auto& nt: nonterm) {
     try {
       d_InsertEntQuery_stmt->
         bind("domain_id",domain_id)->
         bind("qname", nt.first)->
         bind("auth",(nt.second || !d_dnssecQueries))->
         execute()->
-        reset();       
+        reset();
     }
     catch (SSqlException &e) {
       throw PDNSException("GSQLBackend unable to feed empty non-terminal: "+e.txtReason());
@@ -1301,9 +1297,8 @@ bool GSQLBackend::feedEnts3(int domain_id, const DNSName &domain, map<DNSName,bo
       return false;
 
   string ordername;
-  pair<DNSName,bool> nt;
 
-  BOOST_FOREACH(nt, nonterm) {
+  for(const auto& nt: nonterm) {
     try {
       if(narrow || !nt.second) {
         d_InsertEntQuery_stmt->
@@ -1474,7 +1469,7 @@ bool GSQLBackend::replaceComments(const uint32_t domain_id, const DNSName& qname
     throw PDNSException("GSQLBackend unable to delete comment: "+e.txtReason());
   }
 
-  BOOST_FOREACH(const Comment& comment, comments) {
+  for(const auto& comment: comments) {
     feedComment(comment);
   }
 
@@ -1494,7 +1489,7 @@ string GSQLBackend::directBackendCmd(const string &query)
 
    while(stmt->hasNextRow()) {
      stmt->nextRow(row);
-     for(const auto &col: row)
+     for(const auto& col: row)
        out<<"\'"<<col<<"\'\t";
      out<<endl;
    }

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index a08ef33e6beab946cac20e206fdad21ba102ee70..027fcc8e004e05b37a9ba5cc8cca892e6c888555 100644 (file)
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -28,7 +28,6 @@
 #include <string>
 #include <sys/types.h>
 #include <boost/algorithm/string.hpp>
-#include <boost/foreach.hpp>
 #include "dnssecinfra.hh"
 #include "dnsseckeeper.hh"
 #include "dns.hh"
@@ -140,7 +139,7 @@ bool PacketHandler::addDNSKEY(DNSPacket *p, DNSPacket *r, const SOAData& sd)
   DNSSECPrivateKey dpk;
 
   DNSSECKeeper::keyset_t keyset = d_dk.getKeys(p->qdomain);
-  BOOST_FOREACH(DNSSECKeeper::keyset_t::value_type value, keyset) {
+  for(const auto& value: keyset) {
     rr.qtype=QType::DNSKEY;
     rr.ttl=sd.default_ttl;
     rr.qname=p->qdomain;
@@ -723,7 +722,7 @@ int PacketHandler::trySuperMasterSynchronous(DNSPacket *p)
 
   // check if the returned records are NS records
   bool haveNS=false;
-  BOOST_FOREACH(const DNSResourceRecord& ns, nsset) {
+  for(const auto& ns: nsset) {
     if(ns.qtype.getCode()==QType::NS)
       haveNS=true;
   }
@@ -737,7 +736,7 @@ int PacketHandler::trySuperMasterSynchronous(DNSPacket *p)
   DNSBackend *db;
   if(!B.superMasterBackend(p->getRemote(), p->qdomain, nsset, &nameserver, &account, &db)) {
     L<<Logger::Error<<"Unable to find backend willing to host "<<p->qdomain<<" for potential supermaster "<<p->getRemote()<<". Remote nameservers: "<<endl;
-    BOOST_FOREACH(class DNSResourceRecord& rr, nsset) {
+    for(const auto& rr: nsset) {
       if(rr.qtype.getCode()==QType::NS)
         L<<Logger::Error<<rr.content<<endl;
     }
@@ -929,7 +928,7 @@ bool PacketHandler::tryReferral(DNSPacket *p, DNSPacket*r, SOAData& sd, const DN
     return false;
   
   DLOG(L<<"The best NS is: "<<rrset.begin()->qname<<endl);
-  BOOST_FOREACH(DNSResourceRecord rr, rrset) {
+  for(auto& rr: rrset) {
     DLOG(L<<"\tadding '"<<rr.content<<"'"<<endl);
     rr.d_place=DNSResourceRecord::AUTHORITY;
     r->addRecord(rr);
@@ -965,7 +964,7 @@ bool PacketHandler::tryDNAME(DNSPacket *p, DNSPacket*r, SOAData& sd, DNSName &ta
   DLOG(L<<Logger::Warning<<"Let's try DNAME.."<<endl);
   vector<DNSResourceRecord> rrset = getBestDNAMESynth(p, sd, target);
   if(!rrset.empty()) {
-    BOOST_FOREACH(DNSResourceRecord& rr, rrset) {
+    for(auto& rr: rrset) {
       rr.d_place = DNSResourceRecord::ANSWER;
       r->addRecord(rr);
     }
@@ -988,7 +987,7 @@ bool PacketHandler::tryWildcard(DNSPacket *p, DNSPacket*r, SOAData& sd, DNSName
   }
   else {
     DLOG(L<<"The best wildcard match: "<<rrset.begin()->qname<<endl);
-    BOOST_FOREACH(DNSResourceRecord rr, rrset) {
+    for(auto& rr: rrset) {
       rr.wildcardname = rr.qname;
       rr.qname=bestmatch=target;
 
@@ -1328,7 +1327,7 @@ DNSPacket *PacketHandler::questionOrRecurse(DNSPacket *p, bool *shouldRecurse)
     }
                                        
     if(weRedirected) {
-      BOOST_FOREACH(rr, rrset) {
+      for(auto& rr: rrset) {
         if(rr.qtype.getCode() == QType::CNAME) {
           r->addRecord(rr);
           target = rr.content;
@@ -1339,7 +1338,7 @@ DNSPacket *PacketHandler::questionOrRecurse(DNSPacket *p, bool *shouldRecurse)
     }
     else if(weDone) {
       bool haveRecords = false;
-      BOOST_FOREACH(rr, rrset) {
+      for(const auto& rr: rrset) {
         if((p->qtype.getCode() == QType::ANY || rr.qtype == p->qtype) && rr.qtype.getCode() && rr.auth) {
           r->addRecord(rr);
           haveRecords = true;
@@ -1379,7 +1378,7 @@ DNSPacket *PacketHandler::questionOrRecurse(DNSPacket *p, bool *shouldRecurse)
 
     editSOA(d_dk, sd.qname, r);
     
-    BOOST_FOREACH(const DNSResourceRecord& rr, r->getRRS()) {
+    for(const auto& rr: r->getRRS()) {
       if(rr.scopeMask) {
         noCache=1;
         break;