Changeset 1427

Timestamp:

10/11/09 14:50:52 (4 years ago)

Author:

ahu

Message:

huge batch of namespace & stdint cleanups

Location:

trunk/pdns/pdns

Files:

• Makefile-recursor (modified) (1 diff)
• aes/brg_types.h (modified) (1 diff)
• anadns.hh (modified) (1 diff)
• argtng.hh (modified) (1 diff)
• arguments.cc (modified) (1 diff)
• base64.cc (modified) (1 diff)
• devpollmplexer.cc (modified) (1 diff)
• dnsdemog.cc (modified) (1 diff)
• dnsgram.cc (modified) (1 diff)
• dnspacket.cc (modified) (1 diff)
• dnsparser.cc (modified) (1 diff)
• dnsparser.hh (modified) (1 diff)
• dnspcap.cc (modified) (1 diff)
• dnsrecords.hh (modified) (1 diff)
• dnsreplay.cc (modified) (1 diff)
• dnsscan.cc (modified) (1 diff)
• dnsscope.cc (modified) (1 diff)
• dnswasher.cc (modified) (1 diff)
• dnswriter.hh (modified) (1 diff)
• dynloader.cc (modified) (1 diff)
• epollmplexer.cc (modified) (1 diff)
• htimer.cc (modified) (1 diff)
• kqueuemplexer.cc (modified) (1 diff)
• md5.cc (modified) (1 diff)
• md5.hh (modified) (1 diff)
• misc.hh (modified) (1 diff)
• mtasker.cc (modified) (1 diff)
• mtasker.hh (modified) (1 diff)
• nameserver.cc (modified) (1 diff)
• notify.cc (modified) (1 diff)
• nproxy.cc (modified) (1 diff)
• packetcache.hh (modified) (1 diff)
• portsmplexer.cc (modified) (1 diff)
• rcpgenerator.hh (modified) (1 diff)
• rec_channel.hh (modified) (1 diff)
• recursor_cache.cc (modified) (1 diff)
• recursor_cache.hh (modified) (1 diff)
• recursor_memcached.hh (modified) (1 diff)
• selectmplexer.cc (modified) (1 diff)
• sstuff.hh (modified) (1 diff)
• syncres.hh (modified) (2 diffs)
• tcpreceiver.cc (modified) (1 diff)

trunk/pdns/pdns/Makefile-recursor

@@ -26 +26 @@
 rec_channel.o rec_channel_rec.o selectmplexer.o sillyrecords.o \
 dns_random.o aescrypt.o aeskey.o aes_modes.o aestab.o lua-pdns-recursor.o \
-randomhelper.o
+randomhelper.o md5.o
 
 REC_CONTROL_OBJECTS=rec_channel.o rec_control.o arguments.o 

trunk/pdns/pdns/aes/brg_types.h

@@ -48 +48 @@
 #  define ptrint_t intptr_t
 #elif defined( __GNUC__ ) && ( __GNUC__ >= 3 )
-#  include <stdint.h>
+#  include <inttypes.h>
 #  define ptrint_t intptr_t
 #else

trunk/pdns/pdns/anadns.hh

@@ -8 +8 @@
 #include "dnsparser.hh"
 
-using namespace boost;
+#include "namespaces.hh"
 using namespace std;
 

trunk/pdns/pdns/argtng.hh

@@ -8 +8 @@
 #include <boost/regex.hpp>
 using namespace std;
-using namespace boost;
+#include "namespaces.hh"
 
 #define decl(x,y) typeof((y)) (x) = (y)

trunk/pdns/pdns/arguments.cc

@@ -18 +18 @@
 #include "arguments.hh"
 #include <boost/algorithm/string.hpp>
-using namespace boost;
+#include "namespaces.hh"
 
 const ArgvMap::param_t::const_iterator ArgvMap::begin()

trunk/pdns/pdns/base64.cc

@@ -1 +1 @@
 #include "base64.hh"
-#include <stdint.h>
+
 
 namespace anonpdns {

trunk/pdns/pdns/devpollmplexer.cc

@@ -8 +8 @@
 #include "syncres.hh"
 
-using namespace boost;
+#include "namespaces.hh"
 using namespace std;
 

trunk/pdns/pdns/dnsdemog.cc

@@ -11 +11 @@
 #include "anadns.hh"
 
-using namespace boost;
+#include "namespaces.hh"
 using namespace std;
 

trunk/pdns/pdns/dnsgram.cc

@@ -12 +12 @@
 #include "anadns.hh"
 
-using namespace boost;
+#include "namespaces.hh"
 using namespace std;
 

trunk/pdns/pdns/dnspacket.cc

@@ -482 +482 @@
   qdomain=mdp.d_qname;
   if(!qdomain.empty()) // strip dot
-    erase_tail(qdomain, 1);
+    boost::erase_tail(qdomain, 1);
 
   if(!ntohs(d.qdcount)) {

trunk/pdns/pdns/dnsparser.cc

@@ -22 +22 @@
 #include <boost/algorithm/string.hpp>
 
-using namespace boost;
+#include "namespaces.hh"
 
 class UnknownRecordContent : public DNSRecordContent

trunk/pdns/pdns/dnsparser.hh

@@ -49 +49 @@
     
 using namespace std;
-using namespace boost;
+#include "namespaces.hh"
 
 class MOADNSException : public runtime_error

trunk/pdns/pdns/dnspcap.cc

@@ -4 +4 @@
 #include <fcntl.h>
 
-using namespace boost;
+#include "namespaces.hh"
 PcapPacketReader::PcapPacketReader(const string& fname) : d_fname(fname)
 {

trunk/pdns/pdns/dnsrecords.hh

@@ -27 +27 @@
 
 using namespace std;
-using namespace boost;
+#include "namespaces.hh"
 
 #define includeboilerplate(RNAME)   RNAME##RecordContent(const DNSRecord& dr, PacketReader& pr); \

trunk/pdns/pdns/dnsreplay.cc

@@ -60 +60 @@
 #include <boost/multi_index/key_extractors.hpp>
 
-using namespace boost;
+#include "namespaces.hh"
 using namespace ::boost::multi_index;
 using namespace std;

trunk/pdns/pdns/dnsscan.cc

@@ -18 +18 @@
 #include <cctype>
 
-using namespace boost;
+#include "namespaces.hh"
 using namespace ::boost::multi_index;
 using namespace std;

trunk/pdns/pdns/dnsscope.cc

@@ -11 +11 @@
 #include "anadns.hh"
 
-using namespace boost;
+#include "namespaces.hh"
 using namespace std;
 

trunk/pdns/pdns/dnswasher.cc

@@ -16 +16 @@
 #include "dnspcap.hh"
 
-using namespace boost;
+#include "namespaces.hh"
 using namespace std;
 

trunk/pdns/pdns/dnswriter.hh

@@ -6 +6 @@
 #include <map>
 #if !defined SOLARIS8 && !defined WIN32
-#include <stdint.h>
+
 #elif defined WIN32
 #include "utility.hh"

trunk/pdns/pdns/dynloader.cc

@@ -39 +39 @@
 #include "misc.hh"
 using namespace std;
-using namespace boost;
+#include "namespaces.hh"
 
 ArgvMap &arg()

trunk/pdns/pdns/epollmplexer.cc

@@ -10 +10 @@
 #endif
 
-using namespace boost;
+#include "namespaces.hh"
 using namespace std;
 

trunk/pdns/pdns/htimer.cc

@@ -6 +6 @@
 
 using namespace std;
-using namespace boost;
+#include "namespaces.hh"
 
 

trunk/pdns/pdns/kqueuemplexer.cc

@@ -12 +12 @@
 #include <sys/time.h>
 
-using namespace boost;
+#include "namespaces.hh"
 using namespace std;
 

trunk/pdns/pdns/md5.cc

@@ -6 +6 @@
 #include <sys/types.h>
 #include <stdexcept>
-#include <stdint.h>
+
 #include "md5.hh"
 

trunk/pdns/pdns/md5.hh

@@ -3 +3 @@
 
 #include <string>
-#include <stdint.h>
+
 
 

trunk/pdns/pdns/misc.hh

@@ -19 +19 @@
 #ifndef MISC_HH
 #define MISC_HH
-#include <stdint.h>
+#include <inttypes.h>
 #include <cstring>
 #include <cstdio>

trunk/pdns/pdns/mtasker.cc

@@ -1 +1 @@
 /*
     PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2002 - 2006  PowerDNS.COM BV
+    Copyright (C) 2002 - 2009  PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify

trunk/pdns/pdns/mtasker.hh

@@ -33 +33 @@
 #include <boost/multi_index/ordered_index.hpp>
 #include <boost/multi_index/key_extractors.hpp>
-using namespace boost;
+#include "namespaces.hh"
 using namespace ::boost::multi_index;
 

trunk/pdns/pdns/nameserver.cc

@@ -34 +34 @@
 #include "statbag.hh"
 
-using namespace boost;
+#include "namespaces.hh"
 
 extern StatBag S;

trunk/pdns/pdns/notify.cc

@@ -13 +13 @@
 #include "mplexer.hh"
 
-using namespace boost;
+#include "namespaces.hh"
 using namespace ::boost::multi_index;
 using namespace std;

trunk/pdns/pdns/nproxy.cc

@@ -17 +17 @@
 #include "mplexer.hh"
 
-using namespace boost;
+#include "namespaces.hh"
 using namespace ::boost::multi_index;
 using namespace std;

trunk/pdns/pdns/packetcache.hh

@@ -29 +29 @@
 using namespace ::boost::multi_index;
 
-using namespace boost;
+#include "namespaces.hh"
 #include "dnspacket.hh"
 #include "lock.hh"

trunk/pdns/pdns/portsmplexer.cc

@@ -12 +12 @@
 #endif
 
-using namespace boost;
+#include "namespaces.hh"
 using namespace std;
 

trunk/pdns/pdns/rcpgenerator.hh

@@ -24 +24 @@
 #include <stdexcept>
 #if !defined SOLARIS8 && !defined WIN32
-# include <stdint.h>
+
 #elif defined WIN32
 # include "utility.hh"

trunk/pdns/pdns/rec_channel.hh

@@ -4 +4 @@
 #include <map>
 #if !defined SOLARIS8 && !defined WIN32
-#include <stdint.h>
+
 #elif defined WIN32
 #include "utility.hh"

trunk/pdns/pdns/recursor_cache.cc

@@ -10 +10 @@
 
 using namespace std;
-using namespace boost;
+#include "namespaces.hh"
 
 #include "config.h"

trunk/pdns/pdns/recursor_cache.hh

@@ -23 +23 @@
 
 #define L theL()
-using namespace boost;
+#include "namespaces.hh"
 using namespace ::boost::multi_index;
 

trunk/pdns/pdns/recursor_memcached.hh

@@ -2 +2 @@
 #define PDNS_RECURSOR_MEMCACHED_HH
 #include <string>
-#include <stdint.h>
+
 
 class MemcachedCommunicator

trunk/pdns/pdns/selectmplexer.cc

@@ -8 +8 @@
 
 
-using namespace boost;
+#include "namespaces.hh"
 using namespace std;
 

trunk/pdns/pdns/sstuff.hh

@@ -21 +21 @@
 #include <csignal>
 using namespace std;
-using namespace boost;
+#include "namespaces.hh"
 
 

trunk/pdns/pdns/syncres.hh

@@ -526 +526 @@
   uint64_t ednsPingMismatches;
   uint64_t noPingOutQueries, noEdnsOutQueries;
+  uint64_t packetCacheHits;
   time_t startupTime;
 
@@ -557 +558 @@
 std::string reloadAuthAndForwards();
 ComboAddress parseIPAndPort(const std::string& input, uint16_t port);
+ComboAddress getQueryLocalAddress(int family);
 #endif

trunk/pdns/pdns/tcpreceiver.cc

@@ -42 +42 @@
 #include "resolver.hh"
 #include "communicator.hh"
-using namespace boost;
+#include "namespaces.hh"
 
 extern PacketCache PC;