commit 82a2bdb8069829a6239d0914adef9b2ddd20980a
author Josh Gao <jmgao@google.com> Mon Oct 23 21:40:58 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 23 21:40:58 2017 +0000
tree 875b05e43c9728278d29e683a398b70f44b46b60
parent 516ba2cd41d9bb91b01d33daf9794d7cc3f48212
parent 766cbba7689ce70e6b3519b7b86370052ad4c391

Merge "adb: fix erase-remove_if idiom." am: c2a2ecb7a5 am: 1f3763ef4a
am: dbc4b45c90

Change-Id: Iadcd032c968c5db68651e184f6a4c558c33aab22

adb/adb_listeners.cpp

diff --git a/adb/adb_listeners.cpp b/adb/adb_listeners.cpp
index 30cb29b..a142384 100644
--- a/adb/adb_listeners.cpp
+++ b/adb/adb_listeners.cpp
@@ -172,7 +172,7 @@
     auto pred = [](const std::unique_ptr<alistener>& 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,