From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Thu, 28 May 2015 14:39:30 +0000 (+0200)
Subject: Remove the definition and use of pdns::string
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~79^2~7^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bab008e2edf20e3aa66bd5334a73be46e33cbbb3;p=thirdparty%2Fpdns.git

Remove the definition and use of pdns::string
---

diff --git a/pdns/namespaces.hh b/pdns/namespaces.hh
index 7aeedb1895..165f47334c 100644
--- a/pdns/namespaces.hh
+++ b/pdns/namespaces.hh
@@ -35,12 +35,7 @@ using std::ofstream;
 using std::ostream;
 using std::min; // these are a bit scary, everybody uses 'min'
 using std::max;
-
-namespace pdns {
-  typedef std::string string;  
-};
-
-typedef pdns::string string;
+using std::string;
 
 using boost::lexical_cast;
 using boost::tie;
diff --git a/pdns/signingpipe.cc b/pdns/signingpipe.cc
index 418e197574..0240b8edc2 100644
--- a/pdns/signingpipe.cc
+++ b/pdns/signingpipe.cc
@@ -70,7 +70,7 @@ catch(...) {
   return 0;
 }
 
-ChunkedSigningPipe::ChunkedSigningPipe(const std::string& signerName, bool mustSign, const pdns::string& servers, unsigned int workers) 
+ChunkedSigningPipe::ChunkedSigningPipe(const string& signerName, bool mustSign, const string& servers, unsigned int workers)
   : d_queued(0), d_outstanding(0), d_signer(signerName), d_maxchunkrecords(100), d_numworkers(workers), d_tids(d_numworkers),
     d_mustSign(mustSign), d_final(false), d_submitted(0)
 {
diff --git a/pdns/signingpipe.hh b/pdns/signingpipe.hh
index 0a7ae49fb9..003d577ab4 100644
--- a/pdns/signingpipe.hh
+++ b/pdns/signingpipe.hh
@@ -5,10 +5,9 @@
 #include <stdio.h>
 #include "dnsseckeeper.hh"
 #include "dns.hh"
-using std::string;
 using std::vector;
 
-void writeLStringToSocket(int fd, const pdns::string& msg);
+void writeLStringToSocket(int fd, const string& msg);
 bool readLStringFromSocket(int fd, string& msg);
 
 /** input: DNSResourceRecords ordered in qname,qtype (we emit a signature chunk on a break)
@@ -21,7 +20,7 @@ public:
   typedef vector<DNSResourceRecord> rrset_t; 
   typedef rrset_t chunk_t; // for now
   
-  ChunkedSigningPipe(const std::string& signerName, bool mustSign, const pdns::string& servers=pdns::string(), unsigned int numWorkers=3);
+  ChunkedSigningPipe(const string& signerName, bool mustSign, const string& servers=string(), unsigned int numWorkers=3);
   ~ChunkedSigningPipe();
   bool submit(const DNSResourceRecord& rr);
   chunk_t getChunk(bool final=false);