Merge "std::unqiue_ptr<..., decltype(&fn)> seems to be the preferred idiom." am: 2f21b7cecd

am: f2f4e784a4

Change-Id: I6ca3c3471189b2c15f25ac44ee7985f2e121e441
This commit is contained in:
Elliott Hughes 2016-08-08 21:20:24 +00:00 committed by android-build-merger
commit 236a9903fe
1 changed files with 1 additions and 1 deletions

View File

@ -952,7 +952,7 @@ int network_connect(const std::string& host, int port, int type, int timeout, st
_socket_set_errno(err);
return -1;
}
std::unique_ptr<struct addrinfo, decltype(freeaddrinfo)*> addrinfo(addrinfo_ptr, freeaddrinfo);
std::unique_ptr<struct addrinfo, decltype(&freeaddrinfo)> addrinfo(addrinfo_ptr, freeaddrinfo);
addrinfo_ptr = nullptr;
// TODO: Try all the addresses if there's more than one? This just uses