Commit 9336279b authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

[master] fixed the build failure on g++ 4.3.2/Debian: it required exact

type matching for the shared_ptr template parameters in "?:".  Note that
this fix doesn't loosen the constness, so it doesn't compromise anything.
parent db143fb8
......@@ -598,7 +598,7 @@ Resolver::updateConfig(ConstElementPtr config) {
const ConstElementPtr query_acl_cfg(config->get("query_acl"));
const shared_ptr<const RequestACL> query_acl =
query_acl_cfg ? acl::dns::getRequestLoader().load(query_acl_cfg) :
shared_ptr<const RequestACL>();
shared_ptr<RequestACL>();
bool set_timeouts(false);
int qtimeout = impl_->query_timeout_;
int ctimeout = impl_->client_timeout_;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment