more global removes of using namespace boost;

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

diff --git a/pdns/backends/bind/zone2sql.cc b/pdns/backends/bind/zone2sql.cc
index d071dcfb2b8e2b044a96bb19b773e23032cfb8cd..53c8e2aca3c747da2235778ce4b1135aff41cf1c 100644 (file)
--- a/pdns/backends/bind/zone2sql.cc
+++ b/pdns/backends/bind/zone2sql.cc
@@ -40,7 +40,7 @@
 #include <unistd.h>
 #include <boost/foreach.hpp>
 
-using namespace boost;
+
 StatBag S;
 static bool g_doDNSSEC;
 static int g_domainid;
@@ -98,7 +98,7 @@ static void emitRecord(const string& zoneName, const string &qname, const string
     
     string::size_type pos = content.find_first_not_of("0123456789");
     if(pos != string::npos)
-      erase_head(content, pos);
+      boost::erase_head(content, pos);
     trim_left(content);
   }
 

diff --git a/pdns/backends/gsql/gsqlbackend.cc b/pdns/backends/gsql/gsqlbackend.cc
index 7e244c0cf172fd56bcb12b7ef1193d71eb75518c..28ff76cb47881c34f277e4ef55baf43fe1f05fcc 100644 (file)
--- a/pdns/backends/gsql/gsqlbackend.cc
+++ b/pdns/backends/gsql/gsqlbackend.cc
@@ -39,7 +39,7 @@
 #include <boost/foreach.hpp>
 #include <boost/format.hpp>
 
-using namespace boost;
+
 
 void GSQLBackend::setNotified(uint32_t domain_id, uint32_t serial)
 {
@@ -128,7 +128,7 @@ bool GSQLBackend::getDomainInfo(const string &domain, DomainInfo &di)
   di.backend=this;
   
   string type=d_result[0][5];
-  if(iequals(type,"SLAVE")) {
+  if(pdns_iequals(type,"SLAVE")) {
     di.serial=0;
     try {
       SOAData sd;
@@ -143,7 +143,7 @@ bool GSQLBackend::getDomainInfo(const string &domain, DomainInfo &di)
     
     di.kind=DomainInfo::Slave;
   }
-  else if(iequals(type,"MASTER"))
+  else if(pdns_iequals(type,"MASTER"))
     di.kind=DomainInfo::Master;
   else 
     di.kind=DomainInfo::Native;

diff --git a/pdns/dbdnsseckeeper.cc b/pdns/dbdnsseckeeper.cc
index eadbae42de4a2195f97c5250a770ba583cb44afe..fc04268b2aeda9a0c6141071a722ea972e9a1ed0 100644 (file)
--- a/pdns/dbdnsseckeeper.cc
+++ b/pdns/dbdnsseckeeper.cc
@@ -34,7 +34,7 @@
 
 using namespace boost::assign;
 #include "namespaces.hh"
-using namespace boost;
+
 
 DNSSECKeeper::keycache_t DNSSECKeeper::s_keycache;
 DNSSECKeeper::metacache_t DNSSECKeeper::s_metacache;

diff --git a/pdns/dnsbulktest.cc b/pdns/dnsbulktest.cc
index 7280b390ecd6ca971f0a38967df6fe7901ccb43f..04c55c20e9d38856245d857b2180b78b121eb7ff 100644 (file)
--- a/pdns/dnsbulktest.cc
+++ b/pdns/dnsbulktest.cc
@@ -12,7 +12,7 @@
 #include "dnsrecords.hh"
 
 using namespace boost::accumulators;
-using namespace boost;
+
 
 StatBag S;
 

diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index bcb7efa2f4ae9fb6037e36dfdccd77a6b3a5cc82..caf7691188187843f81b875e0fb210607f98740a 100644 (file)
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -16,7 +16,7 @@
 StatBag S;
 PacketCache PC;
 
-using namespace boost;
+using boost::scoped_ptr;
 namespace po = boost::program_options;
 po::variables_map g_vm;