commit 9f69fc714aa5dfbe0f711cb41dc7006b8ebbe43e
author Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 20 02:29:58 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 20 02:29:58 2017 +0000
tree 5bb5af79de86f36c5b387cb46e6500aafe825976
parent eadacbc2e272737aa3acd9609776cc709a1b77c0
parent 44f6e189d97fa3e07e2a95605d4ecd76bc73b103

Merge "Correctly call vector::erase after std::remove_if."

linker/linker_main.cpp

diff --git a/linker/linker_main.cpp b/linker/linker_main.cpp
index 4799739..46cd60c 100644
--- a/linker/linker_main.cpp
+++ b/linker/linker_main.cpp
@@ -129,9 +129,8 @@
   if (path != nullptr) {
     // We have historically supported ':' as well as ' ' in LD_PRELOAD.
     g_ld_preload_names = android::base::Split(path, " :");
-    std::remove_if(g_ld_preload_names.begin(),
-                   g_ld_preload_names.end(),
-                   [] (const std::string& s) { return s.empty(); });
+    g_ld_preload_names.erase(std::remove_if(g_ld_preload_names.begin(), g_ld_preload_names.end(),
+                                            [](const std::string& s) { return s.empty(); }));
   }
 }