diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-11 14:30:49 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-12 22:05:02 -0700 |
| commit | cfbfa0d81327b32478e57cda85059c6063cd4bfd (patch) | |
| tree | 2d3592fb77f6915266ca114247db7439bdde8b66 | |
| parent | 612d941afc1339154354145f6fa5264d3c573cc0 (diff) | |
| download | vcpkg-cfbfa0d81327b32478e57cda85059c6063cd4bfd.tar.gz vcpkg-cfbfa0d81327b32478e57cda85059c6063cd4bfd.zip | |
Rename
| -rw-r--r-- | toolsrc/include/vcpkg_Graphs.h | 8 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg_Dependencies.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/toolsrc/include/vcpkg_Graphs.h b/toolsrc/include/vcpkg_Graphs.h index fb57a38db..b97f7ac50 100644 --- a/toolsrc/include/vcpkg_Graphs.h +++ b/toolsrc/include/vcpkg_Graphs.h @@ -21,7 +21,7 @@ namespace vcpkg::Graphs class Graph { template <class Func> - static void find_topological_sort_internal(V vertex, + static void topological_sort_internal(V vertex, ExplorationStatus& status, const Func adjacency_list_provider, std::unordered_map<V, ExplorationStatus>& exploration_status, @@ -36,7 +36,7 @@ namespace vcpkg::Graphs ExplorationStatus& neighbour_status = exploration_status[neighbour]; if (neighbour_status == ExplorationStatus::NOT_EXPLORED) { - find_topological_sort_internal(neighbour, neighbour_status, adjacency_list_provider, exploration_status, sorted); + topological_sort_internal(neighbour, neighbour_status, adjacency_list_provider, exploration_status, sorted); } else if (neighbour_status == ExplorationStatus::PARTIALLY_EXPLORED) { @@ -70,7 +70,7 @@ namespace vcpkg::Graphs this->vertices[u].insert(v); } - std::vector<V> find_topological_sort() const + std::vector<V> topological_sort() const { std::unordered_map<V, int> indegrees = count_indegrees(); @@ -88,7 +88,7 @@ namespace vcpkg::Graphs ExplorationStatus& status = exploration_status[vertex]; if (status == ExplorationStatus::NOT_EXPLORED) { - find_topological_sort_internal(vertex, + topological_sort_internal(vertex, status, [this](const V& v) { return this->vertices.at(v); }, exploration_status, diff --git a/toolsrc/src/vcpkg_Dependencies.cpp b/toolsrc/src/vcpkg_Dependencies.cpp index 67c2c45a9..e47162953 100644 --- a/toolsrc/src/vcpkg_Dependencies.cpp +++ b/toolsrc/src/vcpkg_Dependencies.cpp @@ -114,7 +114,7 @@ namespace vcpkg::Dependencies std::vector<PackageSpecWithInstallPlan> ret; - const std::vector<PackageSpec> pkgs = graph.find_topological_sort(); + const std::vector<PackageSpec> pkgs = graph.topological_sort(); for (const PackageSpec& pkg : pkgs) { ret.push_back(PackageSpecWithInstallPlan(pkg, std::move(was_examined[pkg]))); @@ -171,7 +171,7 @@ namespace vcpkg::Dependencies std::vector<PackageSpecWithRemovePlan> ret; - const std::vector<PackageSpec> pkgs = graph.find_topological_sort(); + const std::vector<PackageSpec> pkgs = graph.topological_sort(); for (const PackageSpec& pkg : pkgs) { ret.push_back(PackageSpecWithRemovePlan(pkg, std::move(was_examined[pkg]))); |