diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-07-03 01:30:01 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-07-03 01:30:01 +0900 |
| commit | 0d85fb0df319b2ede3fde4a7a66634c1208ffad3 (patch) | |
| tree | dc22c84b9c276b2e492b0394c8ab5ee9476f08de /src/AsyncNameResolverMan.cc | |
| parent | 74d6d6427119591a9a81f64777d90691a221f690 (diff) | |
Use std::unique_ptr for AsyncResolverMan
Diffstat (limited to 'src/AsyncNameResolverMan.cc')
| -rw-r--r-- | src/AsyncNameResolverMan.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/AsyncNameResolverMan.cc b/src/AsyncNameResolverMan.cc index c6ad8da6..9e98bda7 100644 --- a/src/AsyncNameResolverMan.cc +++ b/src/AsyncNameResolverMan.cc @@ -94,13 +94,13 @@ void AsyncNameResolverMan::startAsyncFamily(const std::string& hostname, DownloadEngine* e, Command* command) { - asyncNameResolver_[numResolver_].reset - (new AsyncNameResolver(family + asyncNameResolver_[numResolver_] = std::make_shared<AsyncNameResolver> + (family #ifdef HAVE_ARES_ADDR_NODE - , - e->getAsyncDNSServers() + , + e->getAsyncDNSServers() #endif // HAVE_ARES_ADDR_NODE - )); + ); asyncNameResolver_[numResolver_]->resolve(hostname); setNameResolverCheck(numResolver_, e, command); } @@ -111,9 +111,8 @@ const for(size_t i = 0; i < numResolver_; ++i) { if(asyncNameResolver_[i]->getStatus() == AsyncNameResolver::STATUS_SUCCESS) { - const std::vector<std::string>& addrs = - asyncNameResolver_[i]->getResolvedAddresses(); - res.insert(res.end(), addrs.begin(), addrs.end()); + auto& addrs = asyncNameResolver_[i]->getResolvedAddresses(); + res.insert(std::end(res), std::begin(addrs), std::end(addrs)); } } return; |