Browse Source

[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.

JINMEI Tatuya 14 years ago
parent
commit
9336279b31
1 changed files with 1 additions and 1 deletions
  1. 1 1
      src/bin/resolver/resolver.cc

+ 1 - 1
src/bin/resolver/resolver.cc

@@ -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_;