From: Kees Monshouwer <mind04@monshouwer.org>
Date: Tue, 2 Feb 2016 18:25:28 +0000 (+0100)
Subject: silence g++ 6.0 warnings and error
X-Git-Tag: auth-3.4.8^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3325%2Fhead;p=thirdparty%2Fpdns.git

silence g++ 6.0 warnings and error
---

diff --git a/pdns/rfc2136handler.cc b/pdns/rfc2136handler.cc
index 8cdad016c2..6776f8374d 100644
--- a/pdns/rfc2136handler.cc
+++ b/pdns/rfc2136handler.cc
@@ -791,7 +791,7 @@ int PacketHandler::processUpdate(DNSPacket *p) {
         return RCode::FormErr;
 
       if (rr->d_class == QClass::IN) {
-        rrSetKey_t key = make_pair(stripDot(rr->d_label), rr->d_type);
+        rrSetKey_t key = make_pair(stripDot(rr->d_label), QType(rr->d_type));
         rrVector_t *vec = &preReqRRsets[key];
         vec->push_back(DNSResourceRecord(*rr));
       }
diff --git a/pdns/version.cc b/pdns/version.cc
index 627e4812df..7280493609 100644
--- a/pdns/version.cc
+++ b/pdns/version.cc
@@ -29,9 +29,9 @@ static ProductType productType;
 string compilerVersion()
 {
 #if defined(__clang__)
-  return string("clang "__clang_version__);
+  return string("clang " __clang_version__);
 #elif defined(__GNUC__)
-  return string("gcc "__VERSION__);
+  return string("gcc " __VERSION__);
 #else  // add other compilers here
   return string("Unknown compiler");
 #endif
@@ -61,10 +61,10 @@ string productTypeApiType() {
 
 void showProductVersion()
 {
-  theL()<<Logger::Warning<<productName()<<" "<<PDNS_VERSION<<" ("DIST_HOST") "
+  theL()<<Logger::Warning<<productName()<<" "<<PDNS_VERSION<< " (" DIST_HOST") "
     "(C) 2001-2015 PowerDNS.COM BV" << endl;
   theL()<<Logger::Warning<<"Using "<<(sizeof(unsigned long)*8)<<"-bits mode. "
-    "Built on "BUILD_DATE" by "BUILD_HOST", "<<compilerVersion()<<"."<<endl;
+    "Built on " BUILD_DATE" by " BUILD_HOST", "<<compilerVersion()<<"."<<endl;
   theL()<<Logger::Warning<<"PowerDNS comes with ABSOLUTELY NO WARRANTY. "
     "This is free software, and you are welcome to redistribute it "
     "according to the terms of the GPL version 2." << endl;
@@ -104,7 +104,7 @@ void showBuildConfiguration()
 string fullVersionString()
 {
   ostringstream s;
-  s<<productName()<<" "PDNS_VERSION" ("DIST_HOST" built "BUILD_DATE" "BUILD_HOST")";
+  s<<productName()<<" " PDNS_VERSION" (" DIST_HOST" built " BUILD_DATE" " BUILD_HOST")";
   return s.str();
 }
 
diff --git a/pdns/webserver.cc b/pdns/webserver.cc
index 920ea3acb9..f2d95ddae0 100644
--- a/pdns/webserver.cc
+++ b/pdns/webserver.cc
@@ -270,7 +270,7 @@ HttpResponse WebServer::handleRequest(HttpRequest req)
   }
 
   // always set these headers
-  resp.headers["Server"] = "PowerDNS/"VERSION;
+  resp.headers["Server"] = "PowerDNS/" VERSION;
   resp.headers["Connection"] = "close";
 
   if (req.method == "HEAD") {