diff options
| author | Josh Gao <jmgao@google.com> | 2017-10-23 21:36:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-23 21:36:22 +0000 |
| commit | 1f3763ef4aebb5ab05558644ce9a7ef5846b3bf2 (patch) | |
| tree | ed668424806de88704d35675b84374081ebe9726 /adb | |
| parent | f281046ed473e1e75cc34b2074090f0eb03e651e (diff) | |
| parent | c2a2ecb7a58afaf965ddc0a7ad88af9a9a029b3c (diff) | |
| download | system_core-1f3763ef4aebb5ab05558644ce9a7ef5846b3bf2.tar.gz system_core-1f3763ef4aebb5ab05558644ce9a7ef5846b3bf2.tar.bz2 system_core-1f3763ef4aebb5ab05558644ce9a7ef5846b3bf2.zip | |
Merge "adb: fix erase-remove_if idiom."
am: c2a2ecb7a5
Change-Id: I98bc2547b3785d8ca14565a6a9b7fac84a7c673e
Diffstat (limited to 'adb')
| -rw-r--r-- | adb/adb_listeners.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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<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, |