big batch of 'using namespace std;' removal

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

diff --git a/modules/db2backend/DB2Backend.cc b/modules/db2backend/DB2Backend.cc
index 33016dc6ddd55e42eb3ca18f961ae506b2bbaf72..d9a63522e16dd0714ca46397fc661f1dfeb7b878 100644 (file)
--- a/modules/db2backend/DB2Backend.cc
+++ b/modules/db2backend/DB2Backend.cc
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <sstream>
 
-using namespace std;
+#include "namespaces.hh"
 
 #include <dns.hh>
 #include <dnsbackend.hh>

diff --git a/modules/db2backend/DB2Backend.hh b/modules/db2backend/DB2Backend.hh
index 6ca98e128a08b528e355a53a31b80f58852ce1ca..400e40da69ecafc1d67efa0b87fdd8cb5ff742d7 100644 (file)
--- a/modules/db2backend/DB2Backend.hh
+++ b/modules/db2backend/DB2Backend.hh
@@ -6,7 +6,7 @@
 #include <string>
 #include <map>
 
-using namespace std;
+#include "namespaces.hh"
 
 #include <sqlcli1.h>
 

diff --git a/modules/db2backend/DB2Exception.hh b/modules/db2backend/DB2Exception.hh
index 78a95b9579cde517de9dacd0b03774fb4d4083e1..85eab98417f22a047c6ca99383a4fd760006afa8 100644 (file)
--- a/modules/db2backend/DB2Exception.hh
+++ b/modules/db2backend/DB2Exception.hh
@@ -5,7 +5,7 @@
 
 #include <string>
 
-using namespace std;
+#include "namespaces.hh"
 
 #include <sqlcli1.h>
 

diff --git a/modules/geobackend/geobackend.hh b/modules/geobackend/geobackend.hh
index 9edf2af20c06130b7f3cc5fd829a784a3d0c237a..8e2e9e6102adf365c5da76d42e2aac733391345a 100644 (file)
--- a/modules/geobackend/geobackend.hh
+++ b/modules/geobackend/geobackend.hh
@@ -15,7 +15,7 @@
 
 #include "ippreftree.hh"
 
-using namespace std;
+#include "namespaces.hh"
 
 class GeoRecord {
 public:

diff --git a/modules/geobackend/ippreftree.hh b/modules/geobackend/ippreftree.hh
index ce2e5c3705618d0326635dc833e9c291c47d453b..54780f5e43e6cc13ad3611277dd740f1c95cdd2c 100644 (file)
--- a/modules/geobackend/ippreftree.hh
+++ b/modules/geobackend/ippreftree.hh
@@ -10,7 +10,7 @@
 #include <cstdlib>
 #include <stdint.h>
 
-using namespace std;
+#include "namespaces.hh"
 
 // Use old style C structs for efficiency
 typedef struct node_t {

diff --git a/modules/gmysqlbackend/gmysqlbackend.cc b/modules/gmysqlbackend/gmysqlbackend.cc
index 9d98b0179938ee7ae68cefdc28c60a4e445d1c90..00029455ada6be1a7c4c1f1c94660ea85c95592a 100644 (file)
--- a/modules/gmysqlbackend/gmysqlbackend.cc
+++ b/modules/gmysqlbackend/gmysqlbackend.cc
@@ -2,7 +2,7 @@
 #include <string>
 #include <map>
 
-using namespace std;
+#include "pdns/namespaces.hh"
 
 #include "pdns/dns.hh"
 #include "pdns/dnsbackend.hh"

diff --git a/modules/gmysqlbackend/gmysqlbackend.hh b/modules/gmysqlbackend/gmysqlbackend.hh
index b9f0e7ca62c62e32a3ac5dad1eb8504b7d21e816..68356165cc13d086dab047a24a0b1ef171ca2ea7 100644 (file)
--- a/modules/gmysqlbackend/gmysqlbackend.hh
+++ b/modules/gmysqlbackend/gmysqlbackend.hh
@@ -3,7 +3,7 @@
 
 #include "pdns/backends/gsql/gsqlbackend.hh"
 
-using namespace std;
+#include "pdns/namespaces.hh"
 
 /** The gMySQLBackend is a DNSBackend that can answer DNS related questions. It looks up data
     in MySQL */

diff --git a/modules/gmysqlbackend/smysql.cc b/modules/gmysqlbackend/smysql.cc
index ec666c5a1063450a5dab72e6d96b4fcefba8aafa..f3fb16a77eb524263b4233f26f912e1bd4eb54f6 100644 (file)
--- a/modules/gmysqlbackend/smysql.cc
+++ b/modules/gmysqlbackend/smysql.cc
@@ -7,7 +7,7 @@
 #include "pdns/misc.hh"
 #include "pdns/logger.hh"
 #include "pdns/dns.hh"
-using namespace std;
+#include "pdns/namespaces.hh"
 
 bool SMySQL::s_dolog;
 

diff --git a/modules/goraclebackend/goraclebackend.cc b/modules/goraclebackend/goraclebackend.cc
index adc4d78c141cfb4ada59fa142273321fc0125e5d..8450a467db435fabcf58bc2a92bc2a558a03372e 100644 (file)
--- a/modules/goraclebackend/goraclebackend.cc
+++ b/modules/goraclebackend/goraclebackend.cc
@@ -2,7 +2,7 @@
 #include <string>
 #include <map>
 
-using namespace std;
+#include "namespaces.hh"
 
 #include "pdns/dns.hh"
 #include "pdns/dnsbackend.hh"

diff --git a/modules/goraclebackend/goraclebackend.hh b/modules/goraclebackend/goraclebackend.hh
index 157bc79d534f1cce9ae49724026a747ca949cef0..0f408194bb9b90f43e8a32f94796c1adf670ffff 100644 (file)
--- a/modules/goraclebackend/goraclebackend.hh
+++ b/modules/goraclebackend/goraclebackend.hh
@@ -3,7 +3,7 @@
 
 #include "pdns/backends/gsql/gsqlbackend.hh"
 
-using namespace std;
+#include "namespaces.hh"
 
 /** The gOracleBackend is a DNSBackend that can answer DNS related questions. It looks up data
     in PostgreSQL */

diff --git a/modules/goraclebackend/soracle.cc b/modules/goraclebackend/soracle.cc
index a10646935cebb0aee23292eb36f5e8280fb806a4..fd5fa0ecd4db7baaedeb7fd86b49b9f330cd49b9 100644 (file)
--- a/modules/goraclebackend/soracle.cc
+++ b/modules/goraclebackend/soracle.cc
@@ -8,7 +8,7 @@
 #include "pdns/logger.hh"
 #include "pdns/dns.hh"
 #include <regex.h>
-using namespace std;
+#include "namespaces.hh"
 
 bool SOracle::s_dolog;
 

diff --git a/modules/gpgsqlbackend/gpgsqlbackend.cc b/modules/gpgsqlbackend/gpgsqlbackend.cc
index 1e63db4ac41bb74155791b2d2c2ce56ac0041659..c81f7ee0235259ea886f0adbdda738ae6dcd2b6e 100644 (file)
--- a/modules/gpgsqlbackend/gpgsqlbackend.cc
+++ b/modules/gpgsqlbackend/gpgsqlbackend.cc
@@ -1,7 +1,7 @@
 #include <string>
 #include <map>
 
-using namespace std;
+#include "pdns/namespaces.hh"
 
 #include "pdns/dns.hh"
 #include "pdns/dnsbackend.hh"

diff --git a/modules/gpgsqlbackend/gpgsqlbackend.hh b/modules/gpgsqlbackend/gpgsqlbackend.hh
index 0d0dcc87e64f7de45d4eb498bbe1c71419bc5f29..74f72bbcdbd8c3db08ccc5b77a80aee2f73b6578 100644 (file)
--- a/modules/gpgsqlbackend/gpgsqlbackend.hh
+++ b/modules/gpgsqlbackend/gpgsqlbackend.hh
@@ -2,7 +2,7 @@
 #include <map>
 #include "pdns/backends/gsql/gsqlbackend.hh"
 
-using namespace std;
+#include "pdns/namespaces.hh"
 
 /** The gPgSQLBackend is a DNSBackend that can answer DNS related questions. It looks up data
     in PostgreSQL */

diff --git a/modules/gpgsqlbackend/spgsql.cc b/modules/gpgsqlbackend/spgsql.cc
index 4ff597fb773e2bdea4b9c3ac3091de4919ea4c5b..1693b828b0afc7f7786764ae6cec9decada49d01 100644 (file)
--- a/modules/gpgsqlbackend/spgsql.cc
+++ b/modules/gpgsqlbackend/spgsql.cc
@@ -7,7 +7,7 @@
 #include "pdns/logger.hh"
 #include "pdns/dns.hh"
 
-using namespace std;
+#include "pdns/namespaces.hh"
 
 bool SPgSQL::s_dolog;
 

diff --git a/modules/gpgsqlbackend/spgsql.hh b/modules/gpgsqlbackend/spgsql.hh
index 592b403078efcab29ca39603b9c85f639d30e141..d3606d5b6a5c3207110db8f47a8d31766ec72083 100644 (file)
--- a/modules/gpgsqlbackend/spgsql.hh
+++ b/modules/gpgsqlbackend/spgsql.hh
@@ -2,7 +2,7 @@
    for more information. */
 #ifndef SPGSQL_HH
 #define SPGSQL_HH
-using namespace std;
+#include "pdns/namespaces.hh"
 #include "pdns/backends/gsql/ssql.hh"
 
 #include <libpq-fe.h>

diff --git a/modules/mydnsbackend/mydnsbackend.cc b/modules/mydnsbackend/mydnsbackend.cc
index 79e6af66f326ef2d732d8d0c93f52aa82b12db7a..ec4a6915fa71886247c7e7c7359b5e6f681d6e51 100644 (file)
--- a/modules/mydnsbackend/mydnsbackend.cc
+++ b/modules/mydnsbackend/mydnsbackend.cc
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <sstream>
 
-using namespace std;
+#include "namespaces.hh"
 
 #include <pdns/dns.hh>
 #include <pdns/dnsbackend.hh>

diff --git a/modules/mydnsbackend/mydnsbackend.hh b/modules/mydnsbackend/mydnsbackend.hh
index 5ce616cf1bb52e5ecd5d6f183518a27818921157..d7e4f1988769970cc7adc507b6a061e97d5415d7 100644 (file)
--- a/modules/mydnsbackend/mydnsbackend.hh
+++ b/modules/mydnsbackend/mydnsbackend.hh
@@ -4,7 +4,7 @@
 #include <string>
 #include <map>
 
-using namespace std;
+#include "namespaces.hh"
 
 #include <modules/gmysqlbackend/smysql.hh>
 

diff --git a/modules/mysqlbackend/mysqlcbackend.cc b/modules/mysqlbackend/mysqlcbackend.cc
index 027d03186de3ba1e16aae9ba960fa4b8b6eef54f..900d3798c8202c6401e7f3dc88c25e847ee23656 100644 (file)
--- a/modules/mysqlbackend/mysqlcbackend.cc
+++ b/modules/mysqlbackend/mysqlcbackend.cc
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <sstream>
 
-using namespace std;
+#include "namespaces.hh"
 
 #include <pdns/dns.hh>
 #include <pdns/dnsbackend.hh>

diff --git a/modules/mysqlbackend/mysqlcbackend.hh b/modules/mysqlbackend/mysqlcbackend.hh
index ca4c5b1b495b205001f89022e1044b5df6b9f441..b0e7fb1d505301f20e61271f661a8a539c240a36 100644 (file)
--- a/modules/mysqlbackend/mysqlcbackend.hh
+++ b/modules/mysqlbackend/mysqlcbackend.hh
@@ -4,7 +4,7 @@
 #include <string>
 #include <map>
 
-using namespace std;
+#include "namespaces.hh"
 
 #include <mysql.h>
 

diff --git a/modules/oraclebackend/oraclebackend.cc b/modules/oraclebackend/oraclebackend.cc
index 92ca59f931da1ec3dc8df02837f211ea73421f22..8b1d94a01fc63a0173e97fbb800d02b1da7783f4 100644 (file)
--- a/modules/oraclebackend/oraclebackend.cc
+++ b/modules/oraclebackend/oraclebackend.cc
@@ -11,7 +11,7 @@
 
 #include <string>
 
-using namespace std;
+#include "namespaces.hh"
 
 #include "pdns/dns.hh"
 #include "pdns/dnsbackend.hh"

diff --git a/modules/oraclebackend/oraclebackend.hh b/modules/oraclebackend/oraclebackend.hh
index d5c4d2eb44587a325a08400439f179396d9398e4..58e5f8b90b818190d762865be412eebad7a43bc9 100644 (file)
--- a/modules/oraclebackend/oraclebackend.hh
+++ b/modules/oraclebackend/oraclebackend.hh
@@ -6,7 +6,7 @@
 
 #include <oci.h>
 
-using namespace std;
+#include "namespaces.hh"
 
 class OracleException : public DBException
 {

diff --git a/modules/pdnsbackend/pdnsbackend.cc b/modules/pdnsbackend/pdnsbackend.cc
index 2f7bd6c4e45bc1c93ea2c0838318bc662c360e2f..e843ccfcc3b2b49f8920929cc869d1c90770cc77 100644 (file)
--- a/modules/pdnsbackend/pdnsbackend.cc
+++ b/modules/pdnsbackend/pdnsbackend.cc
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include <sstream>
 
-using namespace std;
+#include "namespaces.hh"
 
 #include <pdns/dns.hh>
 #include <pdns/dnsbackend.hh>

diff --git a/modules/pdnsbackend/pdnsbackend.hh b/modules/pdnsbackend/pdnsbackend.hh
index bfe2d0b278e7533be1f027591178cf5d05f6375c..4159c5cb8b657ad027e4b4a886cd8d9a48a32bbd 100644 (file)
--- a/modules/pdnsbackend/pdnsbackend.hh
+++ b/modules/pdnsbackend/pdnsbackend.hh
@@ -6,7 +6,7 @@
 #include <string>
 #include <map>
 
-using namespace std;
+#include "namespaces.hh"
 
 #include <mysql.h>
 

diff --git a/modules/pipebackend/coprocess.hh b/modules/pipebackend/coprocess.hh
index 2de739d996d5b595fe14590fb8b61ed2be579b37..c2cc454d625f6762126bf2a464b16c06d3a53162 100644 (file)
--- a/modules/pipebackend/coprocess.hh
+++ b/modules/pipebackend/coprocess.hh
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <string>
 
-using namespace std; 
+#include "pdns/namespaces.hh" 
 
 class CoProcess
 {

diff --git a/modules/pipebackend/pipebackend.cc b/modules/pipebackend/pipebackend.cc
index d82a5d9eac48244a5735c420a1826055995c30f1..0ed811b7d910ac4cccca1b9c51a82a798b2fdbc4 100644 (file)
--- a/modules/pipebackend/pipebackend.cc
+++ b/modules/pipebackend/pipebackend.cc
@@ -10,7 +10,7 @@
 #include <sstream>
 #include "coprocess.hh"
 
-using namespace std;
+#include "pdns/namespaces.hh"
 
 #include <pdns/dns.hh>
 #include <pdns/dnsbackend.hh>

diff --git a/modules/pipebackend/pipebackend.hh b/modules/pipebackend/pipebackend.hh
index 0c33f04fa675a103567b1a401a45458daa6be3f3..c93c0b8774fbd8267fabbd86e8680ad405237a7c 100644 (file)
--- a/modules/pipebackend/pipebackend.hh
+++ b/modules/pipebackend/pipebackend.hh
@@ -11,9 +11,8 @@
 #include <sys/types.h>
 #include <regex.h>
 #include <boost/shared_ptr.hpp>
-using namespace boost;
 
-using namespace std;
+#include "pdns/namespaces.hh"
 
 /** very small regex wrapper */
 class Regex

diff --git a/modules/xdbbackend/xgdbm.cc b/modules/xdbbackend/xgdbm.cc
index 025d83098c57611fdc6f222b78e07f8ca4be31e3..51edfbbd85e7aa1599ba93795fc9b8730035f922 100644 (file)
--- a/modules/xdbbackend/xgdbm.cc
+++ b/modules/xdbbackend/xgdbm.cc
@@ -6,7 +6,7 @@
 #include <fcntl.h>
 #include <iostream>
 
-using namespace std;
+#include "namespaces.hh"
 
 GDBM_FILE XGDBMWrapper::s_db;
 int XGDBMWrapper::s_usecount;

diff --git a/modules/xdbbackend/xtdb.cc b/modules/xdbbackend/xtdb.cc
index 01b1a9eba9d94ef041290a3cbd73090356f5aa59..01f6dbc958b144a209cfb45ce33f039eff18a977 100644 (file)
--- a/modules/xdbbackend/xtdb.cc
+++ b/modules/xdbbackend/xtdb.cc
@@ -9,7 +9,7 @@
 #include <iostream>
 
 
-using namespace std;
+#include "namespaces.hh"
 
 TDB_CONTEXT *XTDBWrapper::s_db;
 int XTDBWrapper::s_usecount;

diff --git a/pdns/ahuexception.hh b/pdns/ahuexception.hh
index ae020ae49fd4b8085b8ffeea9d3b038a0f007692..57bd2aa6587d47a6bd61a575c35424e6b923ee88 100644 (file)
--- a/pdns/ahuexception.hh
+++ b/pdns/ahuexception.hh
@@ -22,7 +22,7 @@
 
 #include<string>
 
-using namespace std;
+#include "namespaces.hh"
 
 //! Generic Exception thrown 
 class AhuException

diff --git a/pdns/anadns.hh b/pdns/anadns.hh
index 1c2e16fab81db0f5210ec71e9c4d0915b856d027..4c53effbbab10a4264c58cb77be9f8f91e476ec5 100644 (file)
--- a/pdns/anadns.hh
+++ b/pdns/anadns.hh
@@ -8,7 +8,7 @@
 #include "dnsparser.hh"
 
 #include "namespaces.hh"
-using namespace std;
+#include "namespaces.hh"
 
 struct QuestionIdentifier
 {

diff --git a/pdns/argtng.hh b/pdns/argtng.hh
index 7a931ef92788d8c8b3d2ce8d7550678a1a1572b9..45489aefb760ebf98574e86f8e95dc37047f922f 100644 (file)
--- a/pdns/argtng.hh
+++ b/pdns/argtng.hh
@@ -6,7 +6,7 @@
 #include <cctype>
 #include <boost/shared_ptr.hpp>
 #include <boost/regex.hpp>
-using namespace std;
+#include "namespaces.hh"
 #include "namespaces.hh"
 
 #define decl(x,y) typeof((y)) (x) = (y)

diff --git a/pdns/arguments.hh b/pdns/arguments.hh
index c4e1e3e38a5f15775e67bbf13e0b27ace6026678..5d6f508deecf4727c385eca6e382e42edfcc2f2c 100644 (file)
--- a/pdns/arguments.hh
+++ b/pdns/arguments.hh
@@ -32,7 +32,7 @@
 # include <grp.h>
 #endif
 
-using namespace std;
+#include "namespaces.hh"
 
 typedef AhuException ArgException;
 

diff --git a/pdns/backends/bind/bindbackend2.hh b/pdns/backends/bind/bindbackend2.hh
index 00c6bff7c696e07394ac69241ea256ae8032fc37..0974066db7fbe17b556d85e1b34d092c3bc5da2b 100644 (file)
--- a/pdns/backends/bind/bindbackend2.hh
+++ b/pdns/backends/bind/bindbackend2.hh
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include "misc.hh"
 
-using namespace std;
+#include "namespaces.hh"
 using namespace boost;
 using namespace ::boost::multi_index;
 

diff --git a/pdns/backends/bind/bindparser.hh b/pdns/backends/bind/bindparser.hh
index 250eb8cfac52e82724299a78b04f0f9fdef81f0e..10b0cfd6ae498caca681bbdb4b80f64a2772fa2d 100644 (file)
--- a/pdns/backends/bind/bindparser.hh
+++ b/pdns/backends/bind/bindparser.hh
@@ -23,7 +23,7 @@
 #include <vector>
 #include <set>
 
-using namespace std;
+#include "namespaces.hh"
 
 class BindDomainInfo 
 {

diff --git a/pdns/backends/bind/huffman.hh b/pdns/backends/bind/huffman.hh
index 1ca1916e66f8d6c5128011e85946332046d81ba6..e31d514fcfd1aa64194080108cd66847441915ad 100644 (file)
--- a/pdns/backends/bind/huffman.hh
+++ b/pdns/backends/bind/huffman.hh
@@ -25,7 +25,7 @@
 #include <vector>
 #include "../../ahuexception.hh"
 
-using namespace std;
+#include "namespaces.hh"
 
 class HuffmanCodec
 {

diff --git a/pdns/backends/bind/zone2ldap.cc b/pdns/backends/bind/zone2ldap.cc
index 7ae2244a1b1022a229f2a13f41bcd64d8656cb66..0ee9b699d17d0a7eb95db5ad9a3309384af63adf 100644 (file)
--- a/pdns/backends/bind/zone2ldap.cc
+++ b/pdns/backends/bind/zone2ldap.cc
@@ -154,7 +154,7 @@ int main( int argc, char* argv[] )
         try
         {
 #if __GNUC__ >= 3
-               ios_base::sync_with_stdio( false );
+               std::ios_base::sync_with_stdio( false );
 #endif
                reportAllTypes();
                args.setCmd( "help", "Provide a helpful message" );

diff --git a/pdns/backends/bind/zone2sql.cc b/pdns/backends/bind/zone2sql.cc
index a12adbc6f4cf6d39ebfbba7aa4fff83aa53bfced..8af1ffc8c58ae7bd552894a98c5e5d320cff291a 100644 (file)
--- a/pdns/backends/bind/zone2sql.cc
+++ b/pdns/backends/bind/zone2sql.cc
@@ -30,7 +30,7 @@
 #include <iostream>
 #include <stdio.h>
 
-using namespace std;
+#include "namespaces.hh"
 
 #include "dns.hh"
 #include "arguments.hh"
@@ -198,7 +198,7 @@ int main(int argc, char **argv)
     reportAllTypes();
     reportFancyTypes();
 #if __GNUC__ >= 3
-    ios_base::sync_with_stdio(false);
+    std::ios_base::sync_with_stdio(false);
 #endif
     lastsoa_qname=" ";
     ::arg().setSwitch("mysql","Output in format suitable for mysqlbackend")="yes";

diff --git a/pdns/backends/gsql/gsqlbackend.cc b/pdns/backends/gsql/gsqlbackend.cc
index 20e5c8f45265a462b8e38fb2f959dcf6106083f4..b246c6073b0fd01d686baec59c5d15ce220f87e4 100644 (file)
--- a/pdns/backends/gsql/gsqlbackend.cc
+++ b/pdns/backends/gsql/gsqlbackend.cc
@@ -6,7 +6,7 @@
 #include <string>
 #include <map>
 
-using namespace std;
+#include "namespaces.hh"
 
 #include "pdns/dns.hh"
 #include "pdns/dnsbackend.hh"

diff --git a/pdns/backends/gsql/gsqlbackend.hh b/pdns/backends/gsql/gsqlbackend.hh
index 78ff4ae3083d4755f87feceb6dee4e4b56bc1f13..6876c37d0c2d63e0153ccd929241b64cf248260b 100644 (file)
--- a/pdns/backends/gsql/gsqlbackend.hh
+++ b/pdns/backends/gsql/gsqlbackend.hh
@@ -2,7 +2,7 @@
 #include <map>
 #include "ssql.hh"
 
-using namespace std;
+#include "../../namespaces.hh"
 
 /** The GSQLBackend is a DNSBackend that can answer DNS related questions. It looks up data
     in PostgreSQL */

diff --git a/pdns/backends/gsql/ssql.hh b/pdns/backends/gsql/ssql.hh
index eb32bb53bbf2497da353d8e08e653917ae19097f..2900381a6d088072aed8920d9fa1b28285565369 100644 (file)
--- a/pdns/backends/gsql/ssql.hh
+++ b/pdns/backends/gsql/ssql.hh
@@ -10,7 +10,7 @@
 
 #include <string>
 #include <vector>
-using namespace std;
+#include "../../namespaces.hh"
 
 
 class SSqlException 

diff --git a/pdns/base32.cc b/pdns/base32.cc
index 0c41b07662d4bc70321886d5f116715c97422408..3655442e20fa2a3f6ffbc74ea23e7e2e0f482d59 100644 (file)
--- a/pdns/base32.cc
+++ b/pdns/base32.cc
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <iostream>
 #include "base32.hh"
-using namespace std;
+#include "namespaces.hh"
 
 /* based on freebsd:src/contrib/opie/libopie/btoe.c extract: get bit ranges from a char* */
 uint32_t extract_bits(const char *s, int start, int length)

diff --git a/pdns/binpatch.cc b/pdns/binpatch.cc
index 733f340e6b2bcef811e55f71ff05c36d4a9fafb2..586ca8b25643d60c861f2a7280012a09a4ece5a9 100644 (file)
--- a/pdns/binpatch.cc
+++ b/pdns/binpatch.cc
@@ -32,7 +32,7 @@
 #include <sys/stat.h>
 
 
-using namespace std;
+#include "namespaces.hh"
 
 static void imbue(char *pname, const char *search, const string &replace);
 static string stringerror();

diff --git a/pdns/communicator.hh b/pdns/communicator.hh
index 9e8a29655bc8866d076628a2a4938e0f2f561cc8..a21d7557c933a4a1d8ae396512f9c71992ec0792 100644 (file)
--- a/pdns/communicator.hh
+++ b/pdns/communicator.hh
@@ -39,7 +39,7 @@ using namespace boost::multi_index;
 #include "lock.hh"
 #include "packethandler.hh"
 
-using namespace std;
+#include "namespaces.hh"
 
 struct SuckRequest
 {
@@ -113,7 +113,7 @@ public:
   
   time_t earliest()
   {
-    time_t early=numeric_limits<time_t>::max() - 1; 
+    time_t early=std::numeric_limits<time_t>::max() - 1; 
     for(d_nqueue_t::const_iterator i=d_nqueue.begin();i!=d_nqueue.end();++i) 
       early=min(early,i->next);
     return early-time(0);
@@ -129,7 +129,7 @@ private:
     time_t next;
   };
 
-  typedef list<NotificationRequest>d_nqueue_t;
+  typedef std::list<NotificationRequest>d_nqueue_t;
   d_nqueue_t d_nqueue;
 
 };

diff --git a/pdns/devpollmplexer.cc b/pdns/devpollmplexer.cc
index 09f52d94971d88158dde50a5b07a09f650193ed7..e1cb4c1e0eabbd90ac0d53862db69905432bb20a 100644 (file)
--- a/pdns/devpollmplexer.cc
+++ b/pdns/devpollmplexer.cc
@@ -8,7 +8,7 @@
 #include "syncres.hh"
 
 #include "namespaces.hh"
-using namespace std;
+#include "namespaces.hh"
 
 class DevPollFDMultiplexer : public FDMultiplexer
 {

diff --git a/pdns/dnsbackend.hh b/pdns/dnsbackend.hh
index 1122238281f4a517433cfa3e43c04ef1352ad064..709a4dfde9e177138c8698da016639cad98ee546 100644 (file)
--- a/pdns/dnsbackend.hh
+++ b/pdns/dnsbackend.hh
@@ -38,7 +38,7 @@ class DNSPacket;
 #include "qtype.hh"
 #include "dns.hh"
 #include <vector>
-using namespace std;
+#include "namespaces.hh"
   
 class DNSBackend;  
 struct DomainInfo

diff --git a/pdns/dnsdemog.cc b/pdns/dnsdemog.cc
index 178ee65b3b12ebb7e288703e38c5a187bf6e01be..b4653d29cd87d6621cf7634d984a74da0d41e5ec 100644 (file)
--- a/pdns/dnsdemog.cc
+++ b/pdns/dnsdemog.cc
@@ -11,7 +11,7 @@
 #include "anadns.hh"
 
 #include "namespaces.hh"
-using namespace std;
+#include "namespaces.hh"
 
 StatBag S;
 

diff --git a/pdns/dnsgram.cc b/pdns/dnsgram.cc
index b7f41238c12ca7e5df16added23a60f2fba2cdbe..8c301c0a58545809810492bcc34738796198c8a0 100644 (file)
--- a/pdns/dnsgram.cc
+++ b/pdns/dnsgram.cc
@@ -12,7 +12,7 @@
 #include "anadns.hh"
 
 #include "namespaces.hh"
-using namespace std;
+#include "namespaces.hh"
 
 StatBag S;
 

diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc
index f8a84ef63fd7a0ed5bc15a30fe9106b88a0c75f4..bedc993f52dc49600bf48e923b72d37114d3cf35 100644 (file)
--- a/pdns/dnspacket.cc
+++ b/pdns/dnspacket.cc
@@ -398,7 +398,7 @@ try
 
 
   if(getEDNSOpts(mdp, &edo)) {
-    d_maxreplylen=min(edo.d_packetsize, (uint16_t)1680);
+    d_maxreplylen=std::min(edo.d_packetsize, (uint16_t)1680);
 //    cerr<<edo.d_Z<<endl;
     if(edo.d_Z & EDNSOpts::DNSSECOK)
       d_dnssecOk=true;

diff --git a/pdns/dnsparser.cc b/pdns/dnsparser.cc
index 040c30910b28ff45a11a892abd6fe5e9d8145f4a..2cd94f706451c0d2fcdc2e47f1280c4d397fd141 100644 (file)
--- a/pdns/dnsparser.cc
+++ b/pdns/dnsparser.cc
@@ -264,7 +264,7 @@ void MOADNSParser::init(const char *packet, unsigned int len)
     }
 #endif 
   }
-  catch(out_of_range &re) {
+  catch(std::out_of_range &re) {
     if(validPacket && d_header.tc) { // don't sweat it over truncated packets, but do adjust an, ns and arcount
       if(n < d_header.ancount) {
         d_header.ancount=n; d_header.nscount = d_header.arcount = 0;
@@ -317,7 +317,7 @@ void PacketReader::copyRecord(vector<unsigned char>& dest, uint16_t len)
 void PacketReader::copyRecord(unsigned char* dest, uint16_t len)
 {
   if(d_pos + len > d_content.size())
-    throw out_of_range("Attempt to copy outside of packet");
+    throw std::out_of_range("Attempt to copy outside of packet");
 
   memcpy(dest, &d_content.at(d_pos), len);
   d_pos+=len;
@@ -574,7 +574,7 @@ private:
   {
     d_notyouroffset += by;
     if(d_notyouroffset > d_packet.length())
-      throw out_of_range("dns packet out of range: "+lexical_cast<string>(d_notyouroffset) +" > " 
+      throw std::out_of_range("dns packet out of range: "+lexical_cast<string>(d_notyouroffset) +" > " 
       + lexical_cast<string>(d_packet.length()) );
   }
   std::string& d_packet;

diff --git a/pdns/dnsparser.hh b/pdns/dnsparser.hh
index 052d0b01c8b91e1d3ef9ee58e3519988eaa9c494..6a94910c8434ac23579787e6590fdc2d0e275716 100644 (file)
--- a/pdns/dnsparser.hh
+++ b/pdns/dnsparser.hh
@@ -47,7 +47,7 @@
     And we might be able to reverse 2 -> 3 as well
 */
     
-using namespace std;
+#include "namespaces.hh"
 #include "namespaces.hh"
 
 class MOADNSException : public runtime_error

diff --git a/pdns/dnspcap.hh b/pdns/dnspcap.hh
index 9594700d2f37393622defab34989ac91bb14e09d..66e07b91886499f3718c928e3b5f82b340ed4481 100644 (file)
--- a/pdns/dnspcap.hh
+++ b/pdns/dnspcap.hh
@@ -13,7 +13,7 @@
 #include <net/ethernet.h>
 #include <vector>
 #include <boost/format.hpp>
-using namespace std;
+#include "namespaces.hh"
 
 struct pdns_pcap_file_header {
   uint32_t magic;

diff --git a/pdns/dnsproxy.hh b/pdns/dnsproxy.hh
index ee002a3a3b23f1ffd1b8afcf6ece1245cab5fd77..4be6226a3609ccb7691c7e65fe433d3e910d3239 100644 (file)
--- a/pdns/dnsproxy.hh
+++ b/pdns/dnsproxy.hh
@@ -31,7 +31,7 @@
 #include "lock.hh"
 #include "iputils.hh"
 
-using namespace std;
+#include "namespaces.hh"
 
 /**
 

diff --git a/pdns/dnsrecords.hh b/pdns/dnsrecords.hh
index 163a3aeee076889d819a7582fb1955fdc55d4f6c..93cdceee2e24a91c72cac4a646eb592a2bcefa13 100644 (file)
--- a/pdns/dnsrecords.hh
+++ b/pdns/dnsrecords.hh
@@ -26,7 +26,7 @@
 #include <set>
 #include <bitset>
 
-using namespace std;
+#include "namespaces.hh"
 #include "namespaces.hh"
 
 #define includeboilerplate(RNAME)   RNAME##RecordContent(const DNSRecord& dr, PacketReader& pr); \

diff --git a/pdns/dnsreplay.cc b/pdns/dnsreplay.cc
index be9633e3d80a2ad00918475f8ae63c95ed6f0b44..ea119773bd336a1f21d0d256ccba35dd05976173 100644 (file)
--- a/pdns/dnsreplay.cc
+++ b/pdns/dnsreplay.cc
@@ -61,7 +61,7 @@ What to do with timeouts. We keep around at most 65536 outstanding answers.
 
 #include "namespaces.hh"
 using namespace ::boost::multi_index;
-using namespace std;
+#include "namespaces.hh"
 
 StatBag S;
 bool g_quiet=true;
@@ -369,7 +369,7 @@ try
     {
       s_wednserrors++;
     }
-    catch(out_of_range &e)
+    catch(std::out_of_range &e)
     {
       s_wednserrors++;
     }
@@ -551,7 +551,7 @@ bool sendPacketFromPR(PcapPacketReader& pr, const ComboAddress& remote)
   {
     s_origdnserrors++;
   }
-  catch(out_of_range &e)
+  catch(std::out_of_range &e)
   {
     s_origdnserrors++;
   }

diff --git a/pdns/dnsscan.cc b/pdns/dnsscan.cc
index fef7584c1a75ea9e835d182835348e23d5ea414f..e4dd608fa91133fc3f8496c4a9498e7e91a4e35f 100644 (file)
--- a/pdns/dnsscan.cc
+++ b/pdns/dnsscan.cc
@@ -19,7 +19,7 @@
 
 #include "namespaces.hh"
 using namespace ::boost::multi_index;
-using namespace std;
+#include "namespaces.hh"
 StatBag S;
 
 int main(int argc, char** argv)

diff --git a/pdns/dnsscope.cc b/pdns/dnsscope.cc
index a6a290419f491d06d9b926ae7db8f682194b8328..bb3a4b32877e9d82a5aa863d02ad3373016e742d 100644 (file)
--- a/pdns/dnsscope.cc
+++ b/pdns/dnsscope.cc
@@ -11,7 +11,7 @@
 #include "anadns.hh"
 
 #include "namespaces.hh"
-using namespace std;
+#include "namespaces.hh"
 
 StatBag S;
 

diff --git a/pdns/dnssecinfra.hh b/pdns/dnssecinfra.hh
index ffba00a24167fccad1884ecdef34f484640cfe58..147d964496c7b9d9ee94783f3380cd2c031b5a9c 100644 (file)
--- a/pdns/dnssecinfra.hh
+++ b/pdns/dnssecinfra.hh
@@ -87,7 +87,7 @@ private:
 
 
 
-struct CanonicalCompare: public binary_function<string, string, bool>  
+struct CanonicalCompare: public std::binary_function<string, string, bool>  
 {
   bool operator()(const std::string& a, const std::string& b) {
     std::vector<std::string> avect, bvect;

diff --git a/pdns/dnswasher.cc b/pdns/dnswasher.cc
index 753d191bf8d4fc88273d3d953e3dd19fc827fe6b..0d85acb72239806883806118677882a316de0e8d 100644 (file)
--- a/pdns/dnswasher.cc
+++ b/pdns/dnswasher.cc
@@ -16,7 +16,7 @@ otherwise, obfuscate the response IP address
 #include "dnspcap.hh"
 
 #include "namespaces.hh"
-using namespace std;
+#include "namespaces.hh"
 
 StatBag S;
 

diff --git a/pdns/dnswriter.cc b/pdns/dnswriter.cc
index 7e48b0908a370db32f3fc0e36252496c52ced30f..ddfd19cc2dec294d4b90f6082872a9f21117bebe 100644 (file)
--- a/pdns/dnswriter.cc
+++ b/pdns/dnswriter.cc
@@ -154,9 +154,9 @@ void DNSPacketWriter::xfrText(const string& text, bool)
         d_record.push_back(0);
       else 
         for (unsigned int i = 0; i < beg->length(); i += 0xff){
-          d_record.push_back(min((string::size_type)0xffU, beg->length()-i));
+          d_record.push_back(std::min((string::size_type)0xffU, beg->length()-i));
           const uint8_t* ptr=(uint8_t*)(beg->c_str()) + i;
-          d_record.insert(d_record.end(), ptr, ptr+min((string::size_type)0xffU, beg->length()-i));
+          d_record.insert(d_record.end(), ptr, ptr+ std::min((string::size_type)0xffU, beg->length()-i));
         }
     }
 }

diff --git a/pdns/dnswriter.hh b/pdns/dnswriter.hh
index dc4da6e9b3fbfb215a5fe5832feb0faa1ffa5b96..3e97bd32a5f24f13f93b260ec6307047cc0a6367 100644 (file)
--- a/pdns/dnswriter.hh
+++ b/pdns/dnswriter.hh
@@ -10,7 +10,7 @@
 #include "utility.hh"
 #endif
 #include "dns.hh"
-using namespace std;
+#include "namespaces.hh"
 
 /** this class can be used to write DNS packets. It knows about DNS in the sense that it makes 
     the packet header and record headers.

diff --git a/pdns/dynhandler.hh b/pdns/dynhandler.hh
index c64b2396363f8ea57d0e21c18a70fa78e9b9566c..c2b6ffa39643c693ea25c1d7c1f0764d58fa99ff 100644 (file)
--- a/pdns/dynhandler.hh
+++ b/pdns/dynhandler.hh
@@ -31,7 +31,7 @@
 # include "pdnsservice.hh"
 #endif // WIN32
 
-using namespace std;
+#include "namespaces.hh"
 
 
 bool DLQuitPlease();

diff --git a/pdns/dynlistener.hh b/pdns/dynlistener.hh
index 8914a772eabb34ce8a281aa8d1836dbbf7212442..218d07f686cfd83384323ade8dd83f2f420e9254 100644 (file)
--- a/pdns/dynlistener.hh
+++ b/pdns/dynlistener.hh
@@ -37,7 +37,7 @@
 #include <netinet/in.h>
 #endif // WIN32
 
-using namespace std;
+#include "namespaces.hh"
 
 class DynListener : public boost::noncopyable
 {

diff --git a/pdns/dynloader.cc b/pdns/dynloader.cc
index 0e2fd517683e2c3fecd62ec45aa1ef57d81345c3..d810278dd784e3884dd5d60dad5b61074e9f532c 100644 (file)
--- a/pdns/dynloader.cc
+++ b/pdns/dynloader.cc
@@ -37,7 +37,7 @@
 #include "config.h"
 #include "statbag.hh"
 #include "misc.hh"
-using namespace std;
+#include "namespaces.hh"
 #include "namespaces.hh"
 
 ArgvMap &arg()

diff --git a/pdns/dynmessenger.hh b/pdns/dynmessenger.hh
index 969b68ac018627d8ea31f28b3e320e71d89d8a2d..ed9bc3e2b5b6b073bfd574fedb39c5e47403b2ba 100644 (file)
--- a/pdns/dynmessenger.hh
+++ b/pdns/dynmessenger.hh
@@ -38,7 +38,7 @@
 #include "iputils.hh"
 #include "ahuexception.hh"
 
-using namespace std;
+#include "namespaces.hh"
 
 //! The DynMessenger can send messages to UNIX domain sockets and TCP sockets
 class DynMessenger

diff --git a/pdns/epollmplexer.cc b/pdns/epollmplexer.cc
index fae71a49ca4b904b5d29cab2f446306a4af6ebd6..b5e2276a3c6b3147202ed4ee4911175cb03f7df1 100644 (file)
--- a/pdns/epollmplexer.cc
+++ b/pdns/epollmplexer.cc
@@ -10,7 +10,7 @@
 #endif
 
 #include "namespaces.hh"
-using namespace std;
+#include "namespaces.hh"
 
 class EpollFDMultiplexer : public FDMultiplexer
 {

diff --git a/pdns/htimer.cc b/pdns/htimer.cc
index 393a833678d7038dce0bd0b43ab2287b3c3efbad..b2881c2aee0b95582f0bffb585bf991e5facdea3 100644 (file)
--- a/pdns/htimer.cc
+++ b/pdns/htimer.cc
@@ -4,7 +4,7 @@
 
 HTimer::timers_t HTimer::s_timers;
 
-using namespace std;
+#include "namespaces.hh"
 #include "namespaces.hh"
 
 

diff --git a/pdns/inflighter.cc b/pdns/inflighter.cc
index 4862107920e69c0f87bebbcb3e2b351b157fd8ec..f8c2820c3c2da623e61749090ccb3e947a12378d 100644 (file)
--- a/pdns/inflighter.cc
+++ b/pdns/inflighter.cc
@@ -10,7 +10,7 @@
 #include "statbag.hh"
 #include <sys/socket.h>
 
-using namespace std;
+#include "namespaces.hh"
 using namespace boost::multi_index;
 
 struct TimeTag{};

diff --git a/pdns/iputils.hh b/pdns/iputils.hh
index cfc2671886ef543650bf73a724c9cbc8f4cec838..a8a44c7def0e5e3dddb516f07f26235233a0ed1e 100644 (file)
--- a/pdns/iputils.hh
+++ b/pdns/iputils.hh
@@ -36,7 +36,7 @@
 #include <boost/tuple/tuple_comparison.hpp>
 #include <boost/lexical_cast.hpp>
 
-using namespace std;
+#include "namespaces.hh"
 
 union ComboAddress {
   struct sockaddr_in sin4;
@@ -78,7 +78,7 @@ union ComboAddress {
       return memcmp(&sin6.sin6_addr.s6_addr, &rhs.sin6.sin6_addr.s6_addr, 16) > 0;
   }
 
-  struct addressOnlyLessThan: public binary_function<string, string, bool>
+  struct addressOnlyLessThan: public std::binary_function<string, string, bool>
   {
     bool operator()(const ComboAddress& a, const ComboAddress& b) const
     {

diff --git a/pdns/kqueuemplexer.cc b/pdns/kqueuemplexer.cc
index 4603b2a84cd36e458c228dc9a4f6cbad837b3bc7..9d286bd28137ec28310bdc88450e2d946183f259 100644 (file)
--- a/pdns/kqueuemplexer.cc
+++ b/pdns/kqueuemplexer.cc
@@ -12,7 +12,7 @@
 #include <sys/time.h>
 
 #include "namespaces.hh"
-using namespace std;
+#include "namespaces.hh"
 
 class KqueueFDMultiplexer : public FDMultiplexer
 {

diff --git a/pdns/logger.cc b/pdns/logger.cc
index e60da9e5a73c09d2c5ef0a95448de9a6bf1b96e4..22c2da75bac3a25e3792af171c31c8aa90811244 100644 (file)
--- a/pdns/logger.cc
+++ b/pdns/logger.cc
@@ -23,7 +23,7 @@
 extern StatBag S;
 #endif
 
-using namespace std;
+#include "namespaces.hh"
 
 Logger &theL(const string &pname)
 {

diff --git a/pdns/logger.hh b/pdns/logger.hh
index 861d2de9008be876ef45361d7d40f7fd3b6a1d08..83036c436b22a6b0ea1bc89a9fa6fb0d745944b3 100644 (file)
--- a/pdns/logger.hh
+++ b/pdns/logger.hh
@@ -36,7 +36,7 @@ typedef int pthread_mutex_t;
 typedef int pthread_t;
 #endif // WIN32
 
-using namespace std;
+#include "namespaces.hh"
 
 //! The Logger class can be used to log messages in various ways.
 class Logger
@@ -117,7 +117,7 @@ public:
   Logger& operator<<(Urgency);    //!< set the urgency, << style
 
 #ifndef WIN32
-  Logger& operator<<(ostream & (&)(ostream &)); //!< this is to recognise the endl, and to commit the log
+  Logger& operator<<(std::ostream & (&)(std::ostream &)); //!< this is to recognise the endl, and to commit the log
 #else
   // This is a hack to keep MSVC from generating a internal compiler error.
   Logger& operator<<(ostream & (hack)(ostream &)); //!< this is to recognise the endl, and to commit the log

diff --git a/pdns/lua-pdns-recursor.cc b/pdns/lua-pdns-recursor.cc
index 78230e76985c13d0a1065a3675cd69b8823def05..9abe0522ddefcbdedf92dbc1efab1e7d9d25a92a 100644 (file)
--- a/pdns/lua-pdns-recursor.cc
+++ b/pdns/lua-pdns-recursor.cc
@@ -40,7 +40,7 @@ extern "C" {
 #include <vector>
 #include <stdexcept>
 #include "logger.hh"
-using namespace std;
+#include "namespaces.hh"
 
 bool netmaskMatchTable(lua_State* lua, const std::string& ip)
 {

diff --git a/pdns/lwres.hh b/pdns/lwres.hh
index d69b884bd136a88c963df3857b6f171f63b6a36d..75da5f62e0ccbc4006a2fbca33f7e0b0683e777a 100644 (file)
--- a/pdns/lwres.hh
+++ b/pdns/lwres.hh
@@ -38,7 +38,7 @@
 
 #include "ahuexception.hh"
 #include "dns.hh"
-using namespace std;
+#include "namespaces.hh"
 
 int asendto(const char *data, int len, int flags, const ComboAddress& ip, uint16_t id, 
             const string& domain, uint16_t qtype,  int* fd);

diff --git a/pdns/md5.cc b/pdns/md5.cc
index 244c96fa2beab2471c9dc7accee0b7c987d24670..aff85104ce08fe0ad080615bc2cc15fff04b459b 100644 (file)
--- a/pdns/md5.cc
+++ b/pdns/md5.cc
@@ -8,7 +8,7 @@
 
 #include "md5.hh"
 
-using namespace std;
+#include "namespaces.hh"
 
 namespace {
   

diff --git a/pdns/misc.hh b/pdns/misc.hh
index 4c6169ca2cc8418be764f3f0546d4e6f06f81879..ebcfa443058e2a581a611e1cad4918fa49f87c8a 100644 (file)
--- a/pdns/misc.hh
+++ b/pdns/misc.hh
@@ -68,7 +68,7 @@ struct TSCTimer
 #include <vector>
 #include <boost/optional.hpp>
 
-using namespace std;
+#include "namespaces.hh"
 bool chopOff(string &domain);
 bool chopOffDotted(string &domain);
 
@@ -414,7 +414,7 @@ private:
 };
 
 
-struct CIStringCompare: public binary_function<string, string, bool>  
+struct CIStringCompare: public std::binary_function<string, string, bool>  
 {
   bool operator()(const string& a, const string& b) const
   {

diff --git a/pdns/nameserver.hh b/pdns/nameserver.hh
index 57f85a2b6f7d2ca7b64305c8325fb40b249f2f72..30f164353c1410c7ca792eb3e5a81ecf1909b936 100644 (file)
--- a/pdns/nameserver.hh
+++ b/pdns/nameserver.hh
@@ -1,6 +1,6 @@
 /*
     PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2005  PowerDNS.COM BV
+    Copyright (C) 2005 - 2011  PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify it
     under the terms of the GNU General Public License version 2 as published
@@ -32,7 +32,7 @@
 
 #include <vector>
 #include "statbag.hh"
-using namespace std;
+#include "namespaces.hh"
 
 /** This is the main class. It opens a socket on udp port 53 and waits for packets. Those packets can 
     be retrieved with the receive() member function, which returns a DNSPacket.

diff --git a/pdns/notify.cc b/pdns/notify.cc
index 8d3ded05175448c279ddcdb31e763475ab5a4277..ad1c3fce1cf7db50c33de7fe5189856de204461d 100644 (file)
--- a/pdns/notify.cc
+++ b/pdns/notify.cc
@@ -15,7 +15,7 @@
 
 #include "namespaces.hh"
 using namespace ::boost::multi_index;
-using namespace std;
+#include "namespaces.hh"
 
 namespace po = boost::program_options;
 po::variables_map g_vm;

diff --git a/pdns/nproxy.cc b/pdns/nproxy.cc
index 67f2fde34b875561e42ea9e6d7922270a335ee98..259d995eaf631ac9b7e2ca702321d254ffe9e32e 100644 (file)
--- a/pdns/nproxy.cc
+++ b/pdns/nproxy.cc
@@ -18,7 +18,7 @@
 
 #include "namespaces.hh"
 using namespace ::boost::multi_index;
-using namespace std;
+#include "namespaces.hh"
 
 namespace po = boost::program_options;
 po::variables_map g_vm;

diff --git a/pdns/packetcache.hh b/pdns/packetcache.hh
index a15c7a709bc6e9c8ee9afc58d7b5e19d657b84d1..04cd9bf049d6736fe4016977778fb0fd9c2b445a 100644 (file)
--- a/pdns/packetcache.hh
+++ b/pdns/packetcache.hh
@@ -25,7 +25,7 @@
 #include <map>
 #include "dns.hh"
 #include <boost/version.hpp>
-using namespace std;
+#include "namespaces.hh"
 using namespace ::boost::multi_index;
 
 #include "namespaces.hh"
@@ -44,7 +44,7 @@ using namespace ::boost::multi_index;
     first marks and then sweeps, a second lock is present to prevent simultaneous inserts and deletes.
 */
 
-struct CIBackwardsStringCompare: public binary_function<string, string, bool>  
+struct CIBackwardsStringCompare: public std::binary_function<string, string, bool>  
 {
   bool operator()(const string& str_a, const string& str_b) const
   {

diff --git a/pdns/packethandler.hh b/pdns/packethandler.hh
index 87c61b94bbd394789bcb0ad41cfca896042e275d..6afdde41e10d65ba508fb03bdd5106fbf03ceec9 100644 (file)
--- a/pdns/packethandler.hh
+++ b/pdns/packethandler.hh
@@ -30,7 +30,7 @@
 #include "packetcache.hh"
 #include "dnsseckeeper.hh"
 
-using namespace std;
+#include "namespaces.hh"
 
 // silly Solaris people define PC
 #undef PC

diff --git a/pdns/pdns_hw.cc b/pdns/pdns_hw.cc
index 0ecc7731925e176809ebe07a787c2fecc6011ef9..88299707b9024ebb3a14afe5a98198aec001a6a7 100644 (file)
--- a/pdns/pdns_hw.cc
+++ b/pdns/pdns_hw.cc
@@ -11,7 +11,7 @@
 #include <string>
 #include <sstream>
 
-using namespace std;
+#include "namespaces.hh"
 int main()
 {
         ostringstream str;

diff --git a/pdns/polarrsakeyinfra.cc b/pdns/polarrsakeyinfra.cc
index ded8282a6d0864d94f3c843f93682546533ecc08..5edd2d4b39483661c08666e40228af98648b94b8 100644 (file)
--- a/pdns/polarrsakeyinfra.cc
+++ b/pdns/polarrsakeyinfra.cc
@@ -324,7 +324,7 @@ void RSADNSCryptoKeyEngine::fromPublicKeyString(const std::string& rawString)
 string RSADNSCryptoKeyEngine::getPublicKeyString()  const
 {
   string keystring;
-  char tmp[max(mpi_size(&d_context.E), mpi_size(&d_context.N))];
+  char tmp[std::max(mpi_size(&d_context.E), mpi_size(&d_context.N))];
 
   mpi_write_binary(&d_context.E, (unsigned char*)tmp, mpi_size(&d_context.E) );
   string exponent((char*)tmp, mpi_size(&d_context.E));

diff --git a/pdns/pollmplexer.cc b/pdns/pollmplexer.cc
index 793bfb0c34b07a01b671823d6fdba1ec746c41ab..1613bbbb29ed8c164b252b18b1d31959edadc82b 100644 (file)
--- a/pdns/pollmplexer.cc
+++ b/pdns/pollmplexer.cc
@@ -7,7 +7,7 @@
 #include "syncres.hh"
 #include "utility.hh" 
 #include "namespaces.hh"
-using namespace std;
+#include "namespaces.hh"
 
 
 static FDMultiplexer* make()

diff --git a/pdns/portsmplexer.cc b/pdns/portsmplexer.cc
index 623ce88cb9b5c2c25fe7639c4d8559bf99713297..5a065a5c179fa3a94cd6f718323b64af37da43af 100644 (file)
--- a/pdns/portsmplexer.cc
+++ b/pdns/portsmplexer.cc
@@ -12,7 +12,7 @@
 #include "syncres.hh"
 
 #include "namespaces.hh"
-using namespace std;
+#include "namespaces.hh"
 
 class PortsFDMultiplexer : public FDMultiplexer
 {

diff --git a/pdns/qtype.hh b/pdns/qtype.hh
index 72b1e7c54a071c13534146a503f5fa48efab3601..611982532e14db4646658ffc8045b0fe7ef37482 100644 (file)
--- a/pdns/qtype.hh
+++ b/pdns/qtype.hh
@@ -24,7 +24,7 @@
 #include <vector>
 #include <utility>
 
-using namespace std;
+#include "namespaces.hh"
 
 /** The QType class is meant to deal easily with the different kind of resource types, like 'A', 'NS',
  *  'CNAME' etcetera. These types have both a name and a number. This class can seemlessly move between

diff --git a/pdns/rcpgenerator.hh b/pdns/rcpgenerator.hh
index 4363ae7d9e629cef0060d4770389c9913061915d..f39e6aeebc6b7f0f00c2d16c6f17b9f5e2b4a847 100644 (file)
--- a/pdns/rcpgenerator.hh
+++ b/pdns/rcpgenerator.hh
@@ -28,7 +28,7 @@
 # include "utility.hh"
 #endif
 
-using namespace std;
+#include "namespaces.hh"
 
 class RecordTextException : public runtime_error
 {

diff --git a/pdns/rec_channel.cc b/pdns/rec_channel.cc
index 78e1c9bf5994c5064d003a7258fc53ed911a4ab0..bb6274604f3b4254a71d0457612bde31f4ed34d9 100644 (file)
--- a/pdns/rec_channel.cc
+++ b/pdns/rec_channel.cc
@@ -11,7 +11,7 @@
 
 #include "ahuexception.hh"
 
-using namespace std;
+#include "namespaces.hh"
 
 RecursorControlChannel::RecursorControlChannel()
 {

diff --git a/pdns/rec_channel_rec.cc b/pdns/rec_channel_rec.cc
index 233f193fc329960884dbaaa84521d461e9ff95d2..66fa661fcbdd85485aaa51322ad9a26e8309f5f0 100644 (file)
--- a/pdns/rec_channel_rec.cc
+++ b/pdns/rec_channel_rec.cc
@@ -23,7 +23,7 @@
 #include <sys/time.h>
 #endif
 
-using namespace std;
+#include "namespaces.hh"
 #include "namespaces.hh"
 map<string, const uint32_t*> d_get32bitpointers;
 map<string, const uint64_t*> d_get64bitpointers;

diff --git a/pdns/rec_control.cc b/pdns/rec_control.cc
index 3049dafd797349c9f17246fe0fb976c66a768b5f..121bd0a0b09fdd0c003f62c24970d11145a815cb 100644 (file)
--- a/pdns/rec_control.cc
+++ b/pdns/rec_control.cc
@@ -21,7 +21,7 @@
 #include "arguments.hh"
 #include "config.h"
 
-using namespace std;
+#include "namespaces.hh"
 
 #ifndef RECURSOR
 #include "statbag.hh"

diff --git a/pdns/recursor_cache.cc b/pdns/recursor_cache.cc
index dcbf23743fc15827242e78578504d9bdbad2eff7..38b2ce750eaa02c594210596b8439c6cbc1b44c4 100644 (file)
--- a/pdns/recursor_cache.cc
+++ b/pdns/recursor_cache.cc
@@ -8,7 +8,7 @@
 #include "recursor_cache.hh"
 #include "cachecleaner.hh"
 
-using namespace std;
+#include "namespaces.hh"
 #include "namespaces.hh"
 
 #include "config.h"

diff --git a/pdns/recursor_memcached.cc b/pdns/recursor_memcached.cc
index 1b22437353f5c8e0d0ae8a8507f0dce8a9def311..4cdf355a187895aafd594174a3b9d8ced68c6fe1 100644 (file)
--- a/pdns/recursor_memcached.cc
+++ b/pdns/recursor_memcached.cc
@@ -4,7 +4,7 @@
 #include "recursor_memcached.hh"
 #include <boost/lexical_cast.hpp>
 
-using namespace std;
+#include "namespaces.hh"
 using boost::lexical_cast;
 
 MemcachedCommunicator::MemcachedCommunicator(const std::string& servers)

diff --git a/pdns/resolver.hh b/pdns/resolver.hh
index e5f21585dc749f3898566b23904ec64dc5e4068b..63893d7df81a0f2eeb744774770d7b76db6cbeb1 100644 (file)
--- a/pdns/resolver.hh
+++ b/pdns/resolver.hh
@@ -35,7 +35,7 @@
 
 #include "ahuexception.hh"
 #include "dns.hh"
-using namespace std;
+#include "namespaces.hh"
 
 class ResolverException : public AhuException
 {

diff --git a/pdns/selectmplexer.cc b/pdns/selectmplexer.cc
index daad6f7c42587cbf1cb2e5af8cb399c7d6ad70b3..437ed3833e82e2b632b319560248edd049997f06 100644 (file)
--- a/pdns/selectmplexer.cc
+++ b/pdns/selectmplexer.cc
@@ -8,7 +8,7 @@
 
 
 #include "namespaces.hh"
-using namespace std;
+#include "namespaces.hh"
 
 static FDMultiplexer* make()
 {

diff --git a/pdns/sstuff.hh b/pdns/sstuff.hh
index d516ae7ce19628d8a07f3e64a7a96fad6c5655d8..58afeeeed96614b07fb0787803097a58f666839b 100644 (file)
--- a/pdns/sstuff.hh
+++ b/pdns/sstuff.hh
@@ -19,7 +19,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
 #include <csignal>
-using namespace std;
+#include "namespaces.hh"
 #include "namespaces.hh"
 
 

diff --git a/pdns/statbag.cc b/pdns/statbag.cc
index e0a28cf4e25a3046941398038c0d1e6867b7077b..39e6303630d71a18cfcd787d984fa071ba3c70b6 100644 (file)
--- a/pdns/statbag.cc
+++ b/pdns/statbag.cc
@@ -26,7 +26,7 @@
 #include "arguments.hh"
 #include "lock.hh"
 
-using namespace std;
+#include "namespaces.hh"
 
 StatBag::StatBag()
 {

diff --git a/pdns/statbag.hh b/pdns/statbag.hh
index fdd5efb6e5199f347ead2c7cba9648e31624c0d4..37d8bfe1734fdcfc5ce77bc5bb0e842a6f848cd5 100644 (file)
--- a/pdns/statbag.hh
+++ b/pdns/statbag.hh
@@ -23,7 +23,7 @@
 #include <string>
 #include <vector>
 #include "lock.hh"
-using namespace std;
+#include "namespaces.hh"
 
 class StatRing
 {

diff --git a/pdns/tcpreceiver.hh b/pdns/tcpreceiver.hh
index 250b3517601e761e7f36337eca3f77164d43c58f..fd99bae5799d9c26ee420a24815d51fcc06e3bc3 100644 (file)
--- a/pdns/tcpreceiver.hh
+++ b/pdns/tcpreceiver.hh
@@ -39,7 +39,7 @@
 # include <sys/select.h>
 #endif // WIN32
 
-using namespace std;
+#include "namespaces.hh"
 
 class TCPNameserver
 {

diff --git a/pdns/ueberbackend.hh b/pdns/ueberbackend.hh
index d895fe1568c3243ce935494e55f229db88f96ded..cdd4bea185505dc18c56798acbcc9668492dd494 100644 (file)
--- a/pdns/ueberbackend.hh
+++ b/pdns/ueberbackend.hh
@@ -40,7 +40,7 @@
 #include "dnspacket.hh"
 #include "dnsbackend.hh"
 
-using namespace std;
+#include "namespaces.hh"
 
 class BackendReporter;
 

diff --git a/pdns/unix_utility.cc b/pdns/unix_utility.cc
index 4e5ffdc92b71855a5e36962b83e19035c441f57c..2f311c2105c2f43fb1e4d1f29f6fb03992e7dbcd 100644 (file)
--- a/pdns/unix_utility.cc
+++ b/pdns/unix_utility.cc
@@ -35,7 +35,7 @@ const char *inet_ntop(int af, const void *src, char *dst, size_t cnt);
 #endif
 
 
-using namespace std;
+#include "namespaces.hh"
 
 // Closes a socket.
 int Utility::closesocket( Utility::sock_t socket )

diff --git a/pdns/utility.hh b/pdns/utility.hh
index f3a9a44e3a001064b9f87fd78d0f19ad510be251..aeda2ce19ea9025b811442ce132d2a6785452936 100644 (file)
--- a/pdns/utility.hh
+++ b/pdns/utility.hh
@@ -71,7 +71,7 @@ typedef int socklen_t;
 #endif // WIN32
 #include <string>
 
-using namespace std;
+#include "namespaces.hh"
 
 //! A semaphore class.
 class Semaphore

diff --git a/pdns/webserver.hh b/pdns/webserver.hh
index ff58d0bbf009f96f0a5fe46331782f4a5f1221fc..878fbecdeecf208efa16340c6f9914838bdacae8 100644 (file)
--- a/pdns/webserver.hh
+++ b/pdns/webserver.hh
@@ -22,7 +22,7 @@
 #include <string>
 
 
-using namespace std;
+#include "namespaces.hh"
 class Server;
 
 class WebServer

diff --git a/pdns/win32_dynloader.cc b/pdns/win32_dynloader.cc
index 9bebbb7227832bddfb75e62d76510abc22c30034..e65855a2d6382b4f4084fdc4ecf5e420e706a8aa 100644 (file)
--- a/pdns/win32_dynloader.cc
+++ b/pdns/win32_dynloader.cc
@@ -36,7 +36,7 @@
 #include "arguments.hh"
 #include "statbag.hh"
 #include "misc.hh"
-using namespace std;
+#include "namespaces.hh"
 
 ArgvMap &arg()
 {

diff --git a/pdns/win32_logger.cc b/pdns/win32_logger.cc
index adc4b322f07c85ac934cc6dc8b66b747c09afd48..38e9ddcb829db769fa4db2e49374edd5a1318487 100644 (file)
--- a/pdns/win32_logger.cc
+++ b/pdns/win32_logger.cc
@@ -21,7 +21,7 @@
 #include "logger.hh"
 #include "ntservice.hh" 
 #include "pdnsmsg.hh"
-using namespace std;
+#include "namespaces.hh"
 
 Logger &theL(const string &pname)
 {

diff --git a/pdns/win32_rec_channel.cc b/pdns/win32_rec_channel.cc
index 0628e41d7b8edbe37141e8cb9c1d6f30ca1d0e3f..32a4dc2c1ceff4b452fcc46d17fcd99eddd8eaf3 100644 (file)
--- a/pdns/win32_rec_channel.cc
+++ b/pdns/win32_rec_channel.cc
@@ -6,7 +6,7 @@
 
 #include "ahuexception.hh"
 
-using namespace std;
+#include "namespaces.hh"
 
 RecursorControlChannel::RecursorControlChannel()
 {

diff --git a/pdns/ws.hh b/pdns/ws.hh
index be072cf18380a6c26521bb77d1af4ffd9a9599c9..bc887b5c30519ae2c83801f57f76c4b8cdba326d 100644 (file)
--- a/pdns/ws.hh
+++ b/pdns/ws.hh
@@ -34,7 +34,7 @@
 #endif // HAVE_CONFIG_H
 
 #include "misc.hh"
-using namespace std;
+#include "namespaces.hh"
 
 class Ewma
 {

diff --git a/pdns/zoneparser-tng.hh b/pdns/zoneparser-tng.hh
index 8206c940048b707763a200dfa06d43e61c776e48..9f5bc7821bd5b04877fba2d7e2b0e4d0515ea00f 100644 (file)
--- a/pdns/zoneparser-tng.hh
+++ b/pdns/zoneparser-tng.hh
@@ -23,7 +23,7 @@
 #include <stdexcept>
 #include <stack>
 
-using namespace std;
+#include "namespaces.hh"
 
 class ZoneParserTNG
 {
@@ -57,7 +57,7 @@ private:
     string d_filename;
     int d_lineno;
   };
-  stack<filestate> d_filestates;
+  std::stack<filestate> d_filestates;
 };
 
 #endif