Matt Smith found a remaining 'using namespace boost;' which caused problems for him...

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

diff --git a/pdns/backends/bind/bindbackend2.cc b/pdns/backends/bind/bindbackend2.cc
index 3398764900fe91048665990201a30409c8470f2e..8ee37ec4e09ce9ef40d7c02696bbaed8ab191810 100644 (file)
--- a/pdns/backends/bind/bindbackend2.cc
+++ b/pdns/backends/bind/bindbackend2.cc
@@ -327,7 +327,7 @@ bool Bind2Backend::getDomainInfo(const string &domain, DomainInfo &di)
 {
   shared_ptr<State> state = getState();
   for(id_zone_map_t::const_iterator i = state->id_zone_map.begin(); i != state->id_zone_map.end() ; ++i) { // why is this a linear scan??
-    if(iequals(i->second.d_name,domain)) {
+    if(pdns_iequals(i->second.d_name,domain)) {
       di.id=i->first;
       di.zone=domain;
       di.masters=i->second.d_masters;
@@ -422,7 +422,7 @@ void Bind2Backend::insert(shared_ptr<State> stage, int id, const string &qnameu,
     
     string::size_type pos = bdr.content.find_first_not_of("0123456789");
     if(pos != string::npos)
-      erase_head(bdr.content, pos);
+      boost::erase_head(bdr.content, pos);
     trim_left(bdr.content);
   }
   

diff --git a/pdns/backends/bind/bindbackend2.hh b/pdns/backends/bind/bindbackend2.hh
index 0974066db7fbe17b556d85e1b34d092c3bc5da2b..23c026ab761e70b4c8bc82a75111f694216b0e14 100644 (file)
--- a/pdns/backends/bind/bindbackend2.hh
+++ b/pdns/backends/bind/bindbackend2.hh
@@ -35,10 +35,8 @@
 #include "misc.hh"
 
 #include "namespaces.hh"
-using namespace boost;
 using namespace ::boost::multi_index;
 
-
 /** This struct is used within the Bind2Backend to store DNS information. 
     It is almost identical to a DNSResourceRecord, but then a bit smaller and with different sorting rules, which make sure that the SOA record comes up front.
 */