diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-13 18:02:04 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-14 14:31:45 -0700 |
| commit | 392b3a50ead4092ea3688385b492e5455c5f6ced (patch) | |
| tree | c4bc6a563517694243ded3ef2c45c9a3eda7a101 | |
| parent | 66017aa2c3873c95da863077b184529c96c299b8 (diff) | |
| download | vcpkg-392b3a50ead4092ea3688385b492e5455c5f6ced.tar.gz vcpkg-392b3a50ead4092ea3688385b492e5455c5f6ced.zip | |
Use Util::find_if/not()
| -rw-r--r-- | toolsrc/src/PackageSpec.cpp | 3 | ||||
| -rw-r--r-- | toolsrc/src/VcpkgPaths.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/commands_install.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/commands_remove.cpp | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/toolsrc/src/PackageSpec.cpp b/toolsrc/src/PackageSpec.cpp index 2a7f4506c..a77ac45eb 100644 --- a/toolsrc/src/PackageSpec.cpp +++ b/toolsrc/src/PackageSpec.cpp @@ -1,5 +1,6 @@ #include "pch.h" #include "PackageSpec.h" +#include "vcpkg_Util.h" namespace vcpkg { @@ -29,7 +30,7 @@ namespace vcpkg Expected<PackageSpec> PackageSpec::from_name_and_triplet(const std::string& name, const Triplet& triplet) { - if (std::find_if_not(name.cbegin(), name.cend(), is_valid_package_spec_char) != name.end()) + if (Util::find_if_not(name, is_valid_package_spec_char) != name.end()) { return std::error_code(PackageSpecParseResult::INVALID_CHARACTERS); } diff --git a/toolsrc/src/VcpkgPaths.cpp b/toolsrc/src/VcpkgPaths.cpp index dd1cdf234..6fc0538fd 100644 --- a/toolsrc/src/VcpkgPaths.cpp +++ b/toolsrc/src/VcpkgPaths.cpp @@ -40,7 +40,7 @@ namespace vcpkg static Optional<fs::path> find_if_has_equal_or_greater_version(const std::vector<fs::path>& candidate_paths, const std::wstring& version_check_arguments, const std::array<int, 3>& expected_version) { - auto it = std::find_if(candidate_paths.cbegin(), candidate_paths.cend(), [&](const fs::path& p) + auto it = Util::find_if(candidate_paths, [&](const fs::path& p) { const std::wstring cmd = Strings::wformat(LR"("%s" %s)", p.native(), version_check_arguments); return exists_and_has_equal_or_greater_version(cmd, expected_version); diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp index 31d271141..55b7aaf64 100644 --- a/toolsrc/src/commands_install.cpp +++ b/toolsrc/src/commands_install.cpp @@ -259,7 +259,7 @@ namespace vcpkg::Commands::Install print_plan(install_plan); - const bool has_non_user_requested_packages = std::find_if(install_plan.cbegin(), install_plan.cend(), [](const InstallPlanAction& package)-> bool + const bool has_non_user_requested_packages = Util::find_if(install_plan, [](const InstallPlanAction& package)-> bool { return package.request_type != RequestType::USER_REQUESTED; }) != install_plan.cend(); diff --git a/toolsrc/src/commands_remove.cpp b/toolsrc/src/commands_remove.cpp index 52c01f525..bb8297d02 100644 --- a/toolsrc/src/commands_remove.cpp +++ b/toolsrc/src/commands_remove.cpp @@ -177,7 +177,7 @@ namespace vcpkg::Commands::Remove print_plan(remove_plan); - const bool has_non_user_requested_packages = std::find_if(remove_plan.cbegin(), remove_plan.cend(), [](const RemovePlanAction& package)-> bool + const bool has_non_user_requested_packages = Util::find_if(remove_plan, [](const RemovePlanAction& package)-> bool { return package.request_type != RequestType::USER_REQUESTED; }) != remove_plan.cend(); |