third batch of std::exception

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1276 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/backends/bind/bindbackend2.cc b/pdns/backends/bind/bindbackend2.cc
index 3ecd7a107a0db624bd83ee484f70a91833c9225d..8e52b783cf6b69c6857957de6c9d519f59c22cbe 100644 (file)
--- a/pdns/backends/bind/bindbackend2.cc
+++ b/pdns/backends/bind/bindbackend2.cc
@@ -603,7 +603,7 @@ void Bind2Backend::loadConfig(string* status)
            L<<Logger::Warning<<d_logprefix<<msg.str()<<endl;
            rejected++;
          }
-         catch(exception &ae) {
+         catch(std::exception &ae) {
            ostringstream msg;
            msg<<" error at "+nowTime()+" parsing '"<<i->name<<"' from file '"<<i->filename<<"': "<<ae.what();
 
@@ -718,7 +718,7 @@ void Bind2Backend::queueReload(BB2DomainInfo *bbd)
     msg<<" error at "+nowTime()+" parsing '"<<bbd->d_name<<"' from file '"<<bbd->d_filename<<"': "<<ae.reason;
     bbd->d_status=msg.str();
   }
-  catch(exception &ae) {
+  catch(std::exception &ae) {
     ostringstream msg;
     msg<<" error at "+nowTime()+" parsing '"<<bbd->d_name<<"' from file '"<<bbd->d_filename<<"': "<<ae.what();
     bbd->d_status=msg.str();

diff --git a/pdns/backends/bind/zone2sql.cc b/pdns/backends/bind/zone2sql.cc
index 14f51fe9e563b1f08ad004c9ea76958b34ec1c72..a3f3eec2a658385e073f95768520c9b8666f3622 100644 (file)
--- a/pdns/backends/bind/zone2sql.cc
+++ b/pdns/backends/bind/zone2sql.cc
@@ -287,7 +287,7 @@ int main(int argc, char **argv)
              callback(0, rr.qname, rr.qtype.getName(), rr.content, rr.ttl, rr.priority);
            num_domainsdone++;
          }
-         catch(exception &ae) {
+         catch(std::exception &ae) {
            if(!::arg().mustDo("on-error-resume-next"))
              throw;
            else
@@ -322,7 +322,7 @@ int main(int argc, char **argv)
     cerr<<"\nFatal error: "<<ae.reason<<endl;
     return 0;
   }
-  catch(exception &e) {
+  catch(std::exception &e) {
     cerr<<"died because of STL error: "<<e.what()<<endl;
     exit(0);
   }

diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc
index 5807e23ef5646d37d3736666bc7cf2261ff3008f..8a75f84e37255449f18afc9dd82d3f4852363b1c 100644 (file)
--- a/pdns/dnspacket.cc
+++ b/pdns/dnspacket.cc
@@ -343,7 +343,7 @@ void DNSPacket::wrapup(void)
 
       pw.commit();
     }
-    catch(exception& e) {
+    catch(std::exception& e) {
       L<<Logger::Error<<"Exception: "<<e.what()<<endl;
       throw;
     }
@@ -477,7 +477,7 @@ try
   qclass=mdp.d_qclass;
   return 0;
 }
-catch(exception& e) {
+catch(std::exception& e) {
   return -1;
 }
 

diff --git a/pdns/dnsscope.cc b/pdns/dnsscope.cc
index ed9f11a83bf1c5db619e10cc6acffb5fb036d3bb..a50d0cd546ec2f812bfda82f9819cda31bf529c5 100644 (file)
--- a/pdns/dnsscope.cc
+++ b/pdns/dnsscope.cc
@@ -114,7 +114,7 @@ try
        dnserrors++;
        continue;
       }
-      catch(exception& e) {
+      catch(std::exception& e) {
        if(pw)
          pw->write();
        bogus++;
@@ -211,7 +211,7 @@ try
   if(totpackets)
     cerr<<"Average response time: "<<tottime/totpackets<<" usec"<<endl;
 }
-catch(exception& e)
+catch(std::exception& e)
 {
   cerr<<"Fatal: "<<e.what()<<endl;
 }

diff --git a/pdns/dynlistener.cc b/pdns/dynlistener.cc
index 034546f1a34f0c56068dc3af29658078c1e87641..4c2f8f774fe88255b8256d348fcf11d922bdefa0 100644 (file)
--- a/pdns/dynlistener.cc
+++ b/pdns/dynlistener.cc
@@ -311,7 +311,7 @@ void DynListener::theListener()
     {
       L<<Logger::Error<<"Fatal error 2 in control listener: "<<E<<endl;
     }
-  catch(exception& e)
+  catch(std::exception& e)
     {
       L<<Logger::Error<<"Fatal STL error: "<<e.what()<<endl;
     }

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 0ad14b802a7a53df2aeedf3f4351c7dd9335396d..28f956e2b692ab5fa7560af86d548de7d861b9c5 100644 (file)
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -939,7 +939,7 @@ DNSPacket *PacketHandler::questionOrRecurse(DNSPacket *p, bool *shouldRecurse)
     S.inc("servfail-packets");
     S.ringAccount("servfail-queries",p->qdomain);
   }
-  catch(exception &e) {
+  catch(std::exception &e) {
     L<<Logger::Error<<"Exception building answer packet ("<<e.what()<<") sending out servfail"<<endl;
     delete r;
     r=p->replyPacket();  // generate an empty reply packet    

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index e1f9b1ea554d3e33ce8a8bfc1eb6e971a5973019..83e943434e12e12eb7935352b31f0ea6d3d6b7f0 100644 (file)
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -880,7 +880,7 @@ void handleNewUDPQuestion(int fd, FDMultiplexer::funcparam_t& var)
         try {
           questionExpand(data, len, qname, sizeof(qname), type);  
         }
-        catch(exception &e)
+        catch(std::exception &e)
         {
            throw MOADNSException(e.what());
         }