aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/commands_build.cpp
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-04-03 16:23:23 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2017-04-04 16:44:44 -0700
commitc9f4f312aede4ea8862d50d1cb4ddefe3b1a8362 (patch)
treeb37cdf031e14a3161bbfce8b96ffa12685b0f82e /toolsrc/src/commands_build.cpp
parent3992d3ac643fa7d7794a53a83f54a4d27769ef3c (diff)
downloadvcpkg-c9f4f312aede4ea8862d50d1cb4ddefe3b1a8362.tar.gz
vcpkg-c9f4f312aede4ea8862d50d1cb4ddefe3b1a8362.zip
package_spec_with_install_plan -> PackageSpecWithInstallPlan
Diffstat (limited to 'toolsrc/src/commands_build.cpp')
-rw-r--r--toolsrc/src/commands_build.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp
index 7d53c6c15..b821cf28e 100644
--- a/toolsrc/src/commands_build.cpp
+++ b/toolsrc/src/commands_build.cpp
@@ -13,7 +13,7 @@
namespace vcpkg::Commands::Build
{
- using Dependencies::package_spec_with_install_plan;
+ using Dependencies::PackageSpecWithInstallPlan;
using Dependencies::InstallPlanType;
static const std::string OPTION_CHECKS_ONLY = "--checks-only";
@@ -144,9 +144,9 @@ namespace vcpkg::Commands::Build
const BuildResult result = build_package(spgh, spec, paths, paths.port_dir(spec), status_db);
if (result == BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES)
{
- std::vector<package_spec_with_install_plan> unmet_dependencies = Dependencies::create_install_plan(paths, { spec }, status_db);
+ std::vector<PackageSpecWithInstallPlan> unmet_dependencies = Dependencies::create_install_plan(paths, { spec }, status_db);
unmet_dependencies.erase(
- std::remove_if(unmet_dependencies.begin(), unmet_dependencies.end(), [&spec](const package_spec_with_install_plan& p)
+ std::remove_if(unmet_dependencies.begin(), unmet_dependencies.end(), [&spec](const PackageSpecWithInstallPlan& p)
{
return (p.spec == spec) || (p.plan.plan_type == InstallPlanType::ALREADY_INSTALLED);
}),
@@ -156,7 +156,7 @@ namespace vcpkg::Commands::Build
System::println(System::color::error, "The build command requires all dependencies to be already installed.");
System::println("The following dependencies are missing:");
System::println("");
- for (const package_spec_with_install_plan& p : unmet_dependencies)
+ for (const PackageSpecWithInstallPlan& p : unmet_dependencies)
{
System::println(" %s", p.spec.toString());
}