From: bert hubert <bert.hubert@netherlabs.nl>
Date: Mon, 7 Apr 2014 17:27:11 +0000 (+0200)
Subject: clean up namespace issue for rhel
X-Git-Tag: rec-3.6.0-rc1~77
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2449694c55f57b99cdd63be5f5d77374f87c4e2e;p=thirdparty%2Fpdns.git

clean up namespace issue for rhel
---

diff --git a/pdns/auth-carbon.cc b/pdns/auth-carbon.cc
index 6f9c078b0b..a1811fbaaa 100644
--- a/pdns/auth-carbon.cc
+++ b/pdns/auth-carbon.cc
@@ -5,8 +5,7 @@
 #include "arguments.hh"
 #include "common_startup.hh"
 #include <boost/foreach.hpp>
-
-using namespace std;
+#include "namespaces.hh"
 
 void* carbonDumpThread(void*)
 try
@@ -59,13 +58,13 @@ try
       if(ret==0)
 	L<<Logger::Warning<<"EOF writing carbon data to "<<remote.toStringWithPort();
     }
-    catch(exception& e) {
+    catch(std::exception& e) {
       L<<Logger::Warning<<"Problem sending carbon data: "<<e.what()<<endl;
     }
   }
   return 0;
 }
-catch(exception& e)
+catch(std::exception& e)
 {
   L<<Logger::Error<<"Carbon thread died: "<<e.what()<<endl;
   return 0;