commit 7cc356e351b52e841f2459ab311777ddb6e72afa
author Elliott Hughes <enh@google.com> Mon Aug 08 21:23:23 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 08 21:23:23 2016 +0000
tree 526573d8d3be365136c9501fed93e2750369edc5
parent e36b5a3914eab95fed8b6e277ec60cebb22910f4
parent 6c588945fe0c61daca8eddd689094abcf01a5955

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

Change-Id: I298f2cd8013d2a6fffe7dde212c28198eea044bb

adb/sysdeps_win32.cpp

diff --git a/adb/sysdeps_win32.cpp b/adb/sysdeps_win32.cpp
index ee27406..109a548 100644
--- a/adb/sysdeps_win32.cpp
+++ b/adb/sysdeps_win32.cpp
@@ -952,7 +952,7 @@
         _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