From 4dfaa88610f3dfdc6ad81e93998948e545866ec4 Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Fri, 20 Oct 2017 17:57:42 -0700 Subject: [PATCH] adb: fix erase-remove_if idiom. This probably doesn't have any actual effect, because there should only be one smartsocket listener so this will happen to work, but this looks sketchy. Test: mma Test: adb server nodaemon & (sleep 1; adb kill-server) Change-Id: Id00ab1fc1fc029949c675ae6e3b1a77f3e9e4c69 --- adb/adb_listeners.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adb/adb_listeners.cpp b/adb/adb_listeners.cpp index 30cb29b88..a142384be 100644 --- a/adb/adb_listeners.cpp +++ b/adb/adb_listeners.cpp @@ -172,7 +172,7 @@ void close_smartsockets() EXCLUDES(listener_list_mutex) { auto pred = [](const std::unique_ptr& listener) { return listener->local_name == "*smartsocket*"; }; - listener_list.erase(std::remove_if(listener_list.begin(), listener_list.end(), pred)); + listener_list.remove_if(pred); } InstallStatus install_listener(const std::string& local_name, const char* connect_to,