From adc10f9934d0a6d9854ba3c0d34ed349abf49f72 Mon Sep 17 00:00:00 2001
From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Sat, 15 Nov 2008 20:38:58 +0000
Subject: [PATCH] second batch of std::exception updates for new boost

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1275 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---
 pdns/dnsdemog.cc            | 4 ++--
 pdns/dnsgram.cc             | 4 ++--
 pdns/dnspbench.cc           | 2 +-
 pdns/dnsproxy.cc            | 2 +-
 pdns/dnsreplay.cc           | 4 ++--
 pdns/dnsscan.cc             | 2 +-
 pdns/dnswasher.cc           | 2 +-
 pdns/notify.cc              | 2 +-
 pdns/nproxy.cc              | 6 +++---
 pdns/rcpgenerator.cc        | 2 +-
 pdns/receiver.cc            | 2 +-
 pdns/tcpreceiver.cc         | 2 +-
 pdns/webserver.cc           | 4 ++--
 pdns/win32_pdns_recursor.cc | 4 ++--
 14 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/pdns/dnsdemog.cc b/pdns/dnsdemog.cc
index 66b362274..624d6436f 100644
--- a/pdns/dnsdemog.cc
+++ b/pdns/dnsdemog.cc
@@ -71,7 +71,7 @@ try
 	  //	cerr<<"error parsing packet: "<<mde.what()<<endl;
 	  continue;
 	}
-	catch(exception& e) {
+	catch(std::exception& e) {
 	  cerr << e.what() << endl;
 	  continue;
 	}
@@ -87,7 +87,7 @@ try
   */
 
 }
-catch(exception& e)
+catch(std::exception& e)
 {
   cerr<<"Fatal: "<<e.what()<<endl;
 }
diff --git a/pdns/dnsgram.cc b/pdns/dnsgram.cc
index 75e3e53be..aee72ad97 100644
--- a/pdns/dnsgram.cc
+++ b/pdns/dnsgram.cc
@@ -154,7 +154,7 @@ try
 	  parseErrors++;
 	  continue;
 	}
-	catch(exception& e) {
+	catch(std::exception& e) {
 	  cerr << e.what() << endl;
 	  continue;
 	}
@@ -187,7 +187,7 @@ try
     }
   }
 }
-catch(exception& e)
+catch(std::exception& e)
 {
   cerr<<"Fatal: "<<e.what()<<endl;
 }
diff --git a/pdns/dnspbench.cc b/pdns/dnspbench.cc
index 1c97d2b7b..ae62fe3b7 100644
--- a/pdns/dnspbench.cc
+++ b/pdns/dnspbench.cc
@@ -89,7 +89,7 @@ try
   cerr<<"Out: "<<argv[1]<<" IN "<<argv[2]<<" "<<regen->getZoneRepresentation()<<endl;
 #endif
 }
-catch(exception& e)
+catch(std::exception& e)
 {
   cerr<<"Fatal: "<<e.what()<<"\n";
 }
diff --git a/pdns/dnsproxy.cc b/pdns/dnsproxy.cc
index d09f91c6f..3a498ad60 100644
--- a/pdns/dnsproxy.cc
+++ b/pdns/dnsproxy.cc
@@ -203,7 +203,7 @@ void DNSProxy::mainloop(void)
   catch(AhuException &ae) {
     L<<Logger::Error<<"Fatal error in DNS proxy: "<<ae.reason<<endl;
   }
-  catch(exception &e) {
+  catch(std::exception &e) {
     L<<Logger::Error<<"Communicator thread died because of STL error: "<<e.what()<<endl;
   }
   catch( ... )
diff --git a/pdns/dnsreplay.cc b/pdns/dnsreplay.cc
index a28e36818..42f51da39 100644
--- a/pdns/dnsreplay.cc
+++ b/pdns/dnsreplay.cc
@@ -379,7 +379,7 @@ try
   }
 
 }
-catch(exception& e)
+catch(std::exception& e)
 {
   cerr<<"Receiver thread died: "<<e.what()<<endl;
   exit(1);
@@ -664,7 +664,7 @@ try
   receiveFromReference();
   printStats();
 }
-catch(exception& e)
+catch(std::exception& e)
 {
   cerr<<"Fatal: "<<e.what()<<endl;
 }
diff --git a/pdns/dnsscan.cc b/pdns/dnsscan.cc
index 09ad5aad9..4ed9f459b 100644
--- a/pdns/dnsscan.cc
+++ b/pdns/dnsscan.cc
@@ -78,7 +78,7 @@ try
   }
 
 }
-catch(exception& e)
+catch(std::exception& e)
 {
   cout<<"Fatal: "<<e.what()<<endl;
 }
diff --git a/pdns/dnswasher.cc b/pdns/dnswasher.cc
index a803af383..6203df824 100644
--- a/pdns/dnswasher.cc
+++ b/pdns/dnswasher.cc
@@ -74,7 +74,7 @@ try
   cerr<<"Saw "<<pr.d_correctpackets<<" correct packets, "<<pr.d_runts<<" runts, "<< pr.d_oversized<<" oversize, "<<
     pr.d_nonetheripudp<<" unknown encaps"<<endl;
 }
-catch(exception& e)
+catch(std::exception& e)
 {
   cerr<<"Fatal: "<<e.what()<<endl;
 }
diff --git a/pdns/notify.cc b/pdns/notify.cc
index 1ed6c088b..9095f8471 100644
--- a/pdns/notify.cc
+++ b/pdns/notify.cc
@@ -52,7 +52,7 @@ try
   cerr<<"Received notification response with code: "<<mdp.d_header.rcode<<endl;
   cerr<<"For: '"<<mdp.d_qname<<"'"<<endl;
 }
-catch(exception& e)
+catch(std::exception& e)
 {
   cerr<<"Fatal: "<<e.what()<<endl;
 }
diff --git a/pdns/nproxy.cc b/pdns/nproxy.cc
index e7b66cd8d..11d689e1b 100644
--- a/pdns/nproxy.cc
+++ b/pdns/nproxy.cc
@@ -110,7 +110,7 @@ try
   g_nifs[nif.resentID] = nif;
 
 }
-catch(exception &e)
+catch(std::exception &e)
 {
   syslogFmt(boost::format("Error parsing packet from external nameserver: %s") % e.what());
 }
@@ -159,7 +159,7 @@ try
   g_nifs.erase(mdp.d_header.id);
 
 }
-catch(exception &e)
+catch(std::exception &e)
 {
   syslogFmt(boost::format("Error parsing packet from internal nameserver: %s") % e.what());
 }
@@ -293,7 +293,7 @@ catch(boost::program_options::error& e)
 {
   syslogFmt(boost::format("Error parsing command line options: %s") % e.what());
 }
-catch(exception& e)
+catch(std::exception& e)
 {
   syslogFmt(boost::format("Fatal: %s") % e.what());
 }
diff --git a/pdns/rcpgenerator.cc b/pdns/rcpgenerator.cc
index 979f5d327..b3ca28f3a 100644
--- a/pdns/rcpgenerator.cc
+++ b/pdns/rcpgenerator.cc
@@ -460,7 +460,7 @@ try
   cout<<"Regenerated: '"<<out<<"'\n";
   
 }
-catch(exception& e)
+catch(std::exception& e)
 {
   cerr<<"Fatal: "<<e.what()<<endl;
 }
diff --git a/pdns/receiver.cc b/pdns/receiver.cc
index 0b7752943..58b69c701 100644
--- a/pdns/receiver.cc
+++ b/pdns/receiver.cc
@@ -579,7 +579,7 @@ int main(int argc, char **argv)
       cerr<<"Exiting because: "<<AE.reason<<endl;
     L<<Logger::Error<<"Exiting because: "<<AE.reason<<endl;
   }      
-  catch(exception &e) {
+  catch(std::exception &e) {
     if(!::arg().mustDo("daemon"))
       cerr<<"Exiting because of STL error: "<<e.what()<<endl;
     L<<Logger::Error<<"Exiting because of STL error: "<<e.what()<<endl;
diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc
index 8f240e8ef..8d82fa213 100644
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@ -324,7 +324,7 @@ void *TCPNameserver::doConnection(void *data)
     s_P = 0; // on next call, backend will be recycled
     L<<Logger::Error<<"TCP nameserver had error, cycling backend: "<<ae.reason<<endl;
   }
-  catch(exception &e) {
+  catch(std::exception &e) {
     L<<Logger::Error<<"TCP Connection Thread died because of STL error: "<<e.what()<<endl;
   }
   catch( ... )
diff --git a/pdns/webserver.cc b/pdns/webserver.cc
index 3e31e2a1e..a4077c32c 100644
--- a/pdns/webserver.cc
+++ b/pdns/webserver.cc
@@ -171,7 +171,7 @@ void *WebServer::serveConnection(void *p)
   catch(Exception &e) {
     L<<Logger::Error<<"Exception in webserver: "<<e.reason<<endl;
   }
-  catch(exception &e) {
+  catch(std::exception &e) {
     L<<Logger::Error<<"STL Exception in webserver: "<<e.what()<<endl;
   }
   catch(...) {
@@ -215,7 +215,7 @@ void WebServer::go()
   catch(Exception &e) {
     L<<Logger::Error<<"Fatal error in main webserver thread: "<<e.reason<<endl;
   }
-  catch(exception &e) {
+  catch(std::exception &e) {
     L<<Logger::Error<<"STL Exception in main webserver thread: "<<e.what()<<endl;
   }
   catch(...) {
diff --git a/pdns/win32_pdns_recursor.cc b/pdns/win32_pdns_recursor.cc
index 82d079e78..6d8f7fca8 100644
--- a/pdns/win32_pdns_recursor.cc
+++ b/pdns/win32_pdns_recursor.cc
@@ -596,7 +596,7 @@ int serviceMain( int argc, char *argv[] )
   catch(AhuException &ae) {
     L<<Logger::Error<<"Exception: "<<ae.reason<<endl;
   }
-  catch(exception &e) {
+  catch(std::exception &e) {
     L<<Logger::Error<<"STL Exception: "<<e.what()<<endl;
   }
   catch(...) {
@@ -717,7 +717,7 @@ int main(int argc, char **argv)
   catch(AhuException &ae) {
     L<<Logger::Error<<"Exception: "<<ae.reason<<endl;
   }
-  catch(exception &e) {
+  catch(std::exception &e) {
     L<<Logger::Error<<"STL Exception: "<<e.what()<<endl;
   }
   catch(...) {
-- 
2.50.0