cherry-squash of 38860c862e3064980d6ace6ae5cc2bffd001f45b..9183c9e515c1720e05ef3843a1...

diff --git a/modules/remotebackend/remotebackend.hh b/modules/remotebackend/remotebackend.hh
index c1758d8a4e780af6d569394912d92d1c128a3f76..1f01d968eb1a490a161daaf837a12b17452d5548 100644 (file)
--- a/modules/remotebackend/remotebackend.hh
+++ b/modules/remotebackend/remotebackend.hh
@@ -59,7 +59,7 @@ class HTTPConnector: public Connector {
 
   virtual int send_message(const rapidjson::Document &input);
   virtual int recv_message(rapidjson::Document &output);
-  friend size_t ::httpconnector_write_data(void*, size_t, size_t, void *value);
+  friend size_t httpconnector_write_data(void*, size_t, size_t, void *value);
   private:
     std::string d_url;
     std::string d_url_suffix;

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 0182b2b6f59dd22f179a8e10d0111ccd72c488c6..27fcd1b09666186ac2ac1bcb4d901b613551d116 100644 (file)
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -740,7 +740,7 @@ int PacketHandler::trySuperMasterSynchronous(DNSPacket *p)
   DNSBackend *db;
   if(!B.superMasterBackend(p->getRemote(), p->qdomain, nsset, &account, &db)) {
     L<<Logger::Error<<"Unable to find backend willing to host "<<p->qdomain<<" for potential supermaster "<<p->getRemote()<<". "<<nsset.size()<<" remote nameservers: "<<endl;
-    BOOST_FOREACH(struct DNSResourceRecord& rr, nsset) {
+    BOOST_FOREACH(class DNSResourceRecord& rr, nsset) {
       L<<Logger::Error<<rr.content<<endl;
     }
     return RCode::Refused;

diff --git a/pdns/version.cc b/pdns/version.cc
index 577d4bb348e2f23cc547e92568240dabbbf97c8d..e576c4970550d7f59ed2bfed170aac836930ac50 100644 (file)
--- a/pdns/version.cc
+++ b/pdns/version.cc
@@ -25,8 +25,7 @@ static string productName("");
 string compilerVersion()
 {
 #if defined(__clang__)
-  // clang defines __GNUC__ as well, so put it first.
-  return string("clang "__clang__version);
+  return string("clang "__clang_version__);
 #elif defined(__GNUC__)
   return string("gcc "__VERSION__);
 #elif defined(_MSC_VER)