Changeset 1429

Timestamp:

10/11/09 14:52:27 (11 months ago)

Author:

ahu

Message:

even more namespace cleanups

Location:

trunk/pdns/pdns

Files:

• rec_channel.cc (modified) (1 diff)
• rec_channel_rec.cc (modified) (4 diffs)
• resolver.cc (modified) (3 diffs)

trunk/pdns/pdns/rec_channel.cc

@@ -2 +2 @@
 #include <sys/socket.h>
 #include <cerrno>
+#include <string.h>
 #include <cstdlib>
 #include <unistd.h>

trunk/pdns/pdns/rec_channel_rec.cc

@@ -24 +24 @@
 
 using namespace std;
-using namespace boost;
+#include "namespaces.hh"
 map<string, const uint32_t*> d_get32bitpointers;
 map<string, const uint64_t*> d_get64bitpointers;
@@ -77 +77 @@
   string ret;
   string parm;
+  using boost::replace_all;
   for(T i=begin; i != end; ++i) {
     if(::arg().parmIsset(*i)) {
@@ -231 +232 @@
   addGetStat("cache-misses", &RC.cacheMisses);
 
-  addGetStat("cache-entries", boost::bind(&MemRecursorCache::size, ref(RC)));
+  addGetStat("cache-entries", boost::bind(&MemRecursorCache::size, boost::ref(RC)));
   addGetStat("servfail-answers", &g_stats.servFails);
   addGetStat("nxdomain-answers", &g_stats.nxDomains);
@@ -268 +269 @@
 
   addGetStat("negcache-entries", boost::bind(getNegCacheSize));
-  addGetStat("throttle-entries", boost::bind(&SyncRes::throttle_t::size, ref(SyncRes::s_throttle)));
+  addGetStat("throttle-entries", boost::bind(&SyncRes::throttle_t::size, boost::ref(SyncRes::s_throttle)));
 
   addGetStat("negcache-entries", boost::bind(getNsSpeedsSize));
 
-  addGetStat("concurrent-queries", boost::bind(&MTasker<PacketID,string>::numProcesses, ref(MT)));
+  addGetStat("concurrent-queries", boost::bind(&MTasker<PacketID,string>::numProcesses, boost::ref(MT)));
   addGetStat("outgoing-timeouts", &SyncRes::s_outgoingtimeouts);
   addGetStat("tcp-outqueries", &SyncRes::s_tcpoutqueries);

trunk/pdns/pdns/resolver.cc

@@ -41 +41 @@
 #include "dns_random.hh"
 
-using namespace boost;
+#include "namespaces.hh"
 
 void Resolver::makeUDPSocket()
@@ -419 +419 @@
       rr.qname = i->first.d_label;
       if(!rr.qname.empty())
-        erase_tail(rr.qname, 1); // strip .
+        boost::erase_tail(rr.qname, 1); // strip .
       rr.qtype = i->first.d_type;
       rr.ttl = i->first.d_ttl;
@@ -427 +427 @@
 
       if(!rr.content.empty() && (qtype==QType::MX || qtype==QType::NS || qtype==QType::CNAME))
-        erase_tail(rr.content, 1);
+        boost::erase_tail(rr.content, 1);
 
       if(rr.qtype.getCode() == QType::MX) {