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

am: 2f21b7cecd

Change-Id: I9fa6d99a61053dae4ad60c0b73ddac755b29cf61
This commit is contained in:
Elliott Hughes 2016-08-08 21:17:54 +00:00 committed by android-build-merger
commit f2f4e784a4

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