Permalink
Browse files

silence g++ 6.0 warnings and error

  • Loading branch information...
1 parent ce92ff1 commit 07ea6ac8e991b1262a09afb49926d61b32b5f605 @mind04 mind04 committed with mind04 Feb 2, 2016
Showing with 7 additions and 7 deletions.
  1. +1 −1 pdns/rfc2136handler.cc
  2. +5 −5 pdns/version.cc
  3. +1 −1 pdns/webserver.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));
}
View
@@ -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();
}
View
@@ -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") {

0 comments on commit 07ea6ac

Please sign in to comment.