Permalink
Browse files

cherry-squash of 38860c8..9183c9e, clang fixes by Aki Tuomi, thanks!

  • Loading branch information...
1 parent aff6742 commit 8714c9cd453c5838e8e2026872f87ecbbb5ce66a @Habbie Habbie committed Jun 10, 2013
Showing with 3 additions and 4 deletions.
  1. +1 −1 modules/remotebackend/remotebackend.hh
  2. +1 −1 pdns/packethandler.cc
  3. +1 −2 pdns/version.cc
@@ -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;
@@ -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;
View
@@ -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)

0 comments on commit 8714c9c

Please sign in to comment.