Merge pull request #936 from ras0219/master

Revert "Use Util::keep_if()"

1 files changed, 6 insertions, 5 deletions

diff --git a/toolsrc/src/vcpkglib.cpp b/toolsrc/src/vcpkglib.cpp
index fb1f39256..5e847019f 100644
--- a/toolsrc/src/vcpkglib.cpp
+++ b/toolsrc/src/vcpkglib.cpp
@@ -4,7 +4,6 @@
 #include "Paragraphs.h"
 #include "metrics.h"
 #include "vcpkg_Strings.h"
-#include "vcpkg_Util.h"
 
 namespace vcpkg
 {
@@ -202,10 +201,12 @@ namespace vcpkg
             upgrade_to_slash_terminated_sorted_format(&installed_files_of_current_pgh, listfile_path);
 
             // Remove the directories
-            Util::keep_if(installed_files_of_current_pgh, [](const std::string& file) -> bool
-            {
-                return file.back() != '/';
-            });
+            installed_files_of_current_pgh.erase(
+                std::remove_if(installed_files_of_current_pgh.begin(), installed_files_of_current_pgh.end(), [](const std::string& file) -> bool
+                               {
+                                   return file.back() == '/';
+                               }
+                ), installed_files_of_current_pgh.end());
 
             StatusParagraphAndAssociatedFiles pgh_and_files = { *pgh, SortedVector<std::string>(std::move(installed_files_of_current_pgh)) };
             installed_files.push_back(std::move(pgh_and_files));