aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-04-03 16:24:18 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2017-04-04 16:44:45 -0700
commit502a1fb43a7e1d8e8d45a1ac48da6e00af7978ee (patch)
treeb7e676fd6499a6f9ad5df43da894b1629579e726 /toolsrc/src
parent1723c4e5412ee8cbee9f9ebc8ff634f18a9f5632 (diff)
downloadvcpkg-502a1fb43a7e1d8e8d45a1ac48da6e00af7978ee.tar.gz
vcpkg-502a1fb43a7e1d8e8d45a1ac48da6e00af7978ee.zip
remove_plan_action -> RemovePlanAction
Diffstat (limited to 'toolsrc/src')
-rw-r--r--toolsrc/src/vcpkg_Dependencies.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/toolsrc/src/vcpkg_Dependencies.cpp b/toolsrc/src/vcpkg_Dependencies.cpp
index 45084a6a3..a5fec43b7 100644
--- a/toolsrc/src/vcpkg_Dependencies.cpp
+++ b/toolsrc/src/vcpkg_Dependencies.cpp
@@ -22,15 +22,15 @@ namespace vcpkg::Dependencies
{
}
- remove_plan_action::remove_plan_action() : plan_type(RemovePlanType::UNKNOWN), request_type(RequestType::UNKNOWN)
+ RemovePlanAction::RemovePlanAction() : plan_type(RemovePlanType::UNKNOWN), request_type(RequestType::UNKNOWN)
{
}
- remove_plan_action::remove_plan_action(const RemovePlanType& plan_type, const Dependencies::RequestType& request_type) : plan_type(plan_type), request_type(request_type)
+ RemovePlanAction::RemovePlanAction(const RemovePlanType& plan_type, const Dependencies::RequestType& request_type) : plan_type(plan_type), request_type(request_type)
{
}
- package_spec_with_remove_plan::package_spec_with_remove_plan(const PackageSpec& spec, remove_plan_action&& plan)
+ package_spec_with_remove_plan::package_spec_with_remove_plan(const PackageSpec& spec, RemovePlanAction&& plan)
: spec(spec), plan(std::move(plan))
{
}
@@ -106,7 +106,7 @@ namespace vcpkg::Dependencies
{
std::unordered_set<PackageSpec> specs_as_set(specs.cbegin(), specs.cend());
- std::unordered_map<PackageSpec, remove_plan_action> was_examined; // Examine = we have checked its immediate (non-recursive) dependencies
+ std::unordered_map<PackageSpec, RemovePlanAction> was_examined; // Examine = we have checked its immediate (non-recursive) dependencies
Graphs::Graph<PackageSpec> graph;
graph.add_vertices(specs);
@@ -124,7 +124,7 @@ namespace vcpkg::Dependencies
const StatusParagraphs::const_iterator it = status_db.find(spec);
if (it == status_db.end() || (*it)->state == InstallState::NOT_INSTALLED)
{
- was_examined.emplace(spec, remove_plan_action(RemovePlanType::NOT_INSTALLED, RequestType::USER_REQUESTED));
+ was_examined.emplace(spec, RemovePlanAction(RemovePlanType::NOT_INSTALLED, RequestType::USER_REQUESTED));
continue;
}
@@ -146,7 +146,7 @@ namespace vcpkg::Dependencies
}
const RequestType request_type = specs_as_set.find(spec) != specs_as_set.end() ? RequestType::USER_REQUESTED : RequestType::AUTO_SELECTED;
- was_examined.emplace(spec, remove_plan_action(RemovePlanType::REMOVE, request_type));
+ was_examined.emplace(spec, RemovePlanAction(RemovePlanType::REMOVE, request_type));
}
std::vector<package_spec_with_remove_plan> ret;