aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/vcpkg_Dependencies.cpp
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2016-11-15 11:56:46 -0800
committerAlexander Karatarakis <alkarata@microsoft.com>2016-11-15 12:47:43 -0800
commitb64b0cbc8a34e5761fbf7fda75fda49906f116ea (patch)
treea3351f072f0c404f94427a8772f23aca929ea566 /toolsrc/src/vcpkg_Dependencies.cpp
parent2b204e673914b20e662ed17f667c267690fd6b52 (diff)
downloadvcpkg-b64b0cbc8a34e5761fbf7fda75fda49906f116ea.tar.gz
vcpkg-b64b0cbc8a34e5761fbf7fda75fda49906f116ea.zip
Renames and cleanup
Diffstat (limited to 'toolsrc/src/vcpkg_Dependencies.cpp')
-rw-r--r--toolsrc/src/vcpkg_Dependencies.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/toolsrc/src/vcpkg_Dependencies.cpp b/toolsrc/src/vcpkg_Dependencies.cpp
index 2b7e132cc..41172ba0f 100644
--- a/toolsrc/src/vcpkg_Dependencies.cpp
+++ b/toolsrc/src/vcpkg_Dependencies.cpp
@@ -44,7 +44,7 @@ namespace vcpkg { namespace Dependencies
auto it = status_db.find(spec);
if (it != status_db.end() && (*it)->want == want_t::install)
{
- was_examined.emplace(spec, install_plan_action{install_plan_kind::ALREADY_INSTALLED, nullptr, nullptr});
+ was_examined.emplace(spec, install_plan_action{install_plan_type::ALREADY_INSTALLED, nullptr, nullptr});
continue;
}
@@ -52,7 +52,7 @@ namespace vcpkg { namespace Dependencies
if (BinaryParagraph* bpgh = maybe_bpgh.get())
{
process_dependencies(bpgh->depends);
- was_examined.emplace(spec, install_plan_action{install_plan_kind::INSTALL, std::make_unique<BinaryParagraph>(std::move(*bpgh)), nullptr});
+ was_examined.emplace(spec, install_plan_action{install_plan_type::INSTALL, std::make_unique<BinaryParagraph>(std::move(*bpgh)), nullptr});
continue;
}
@@ -60,7 +60,7 @@ namespace vcpkg { namespace Dependencies
SourceParagraph* spgh = maybe_spgh.get();
Checks::check_exit(spgh != nullptr, "Cannot find package");
process_dependencies(filter_dependencies(spgh->depends, spec.target_triplet()));
- was_examined.emplace(spec, install_plan_action{install_plan_kind::BUILD_AND_INSTALL, nullptr, std::make_unique<SourceParagraph>(std::move(*spgh))});
+ was_examined.emplace(spec, install_plan_action{install_plan_type::BUILD_AND_INSTALL, nullptr, std::make_unique<SourceParagraph>(std::move(*spgh))});
}
std::vector<package_spec_with_install_plan> ret;