Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40978b18 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

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

Merge "std::unqiue_ptr<..., decltype(&fn)> seems to be the preferred idiom." am: 2f21b7ce am: f2f4e784 am: 236a9903
am: 0ce32b03

Change-Id: Ie7f001688664b428d98a6835256ee8d16c07efed
parents cd0009e4 0ce32b03

adb/sysdeps_win32.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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