package_spec -> PackageSpec

1 files changed, 19 insertions, 19 deletions

diff --git a/toolsrc/src/vcpkg_Dependencies.cpp b/toolsrc/src/vcpkg_Dependencies.cpp
index 1c6b617f0..9f6181a46 100644
--- a/toolsrc/src/vcpkg_Dependencies.cpp
+++ b/toolsrc/src/vcpkg_Dependencies.cpp
@@ -2,7 +2,7 @@
 #include "vcpkg_Dependencies.h"
 #include "vcpkg_Graphs.h"
 #include "vcpkg_paths.h"
-#include "package_spec.h"
+#include "PackageSpec.h"
 #include "StatusParagraphs.h"
 #include "vcpkg_Files.h"
 #include "Paragraphs.h"
@@ -18,7 +18,7 @@ namespace vcpkg::Dependencies
     {
     }
 
-    package_spec_with_install_plan::package_spec_with_install_plan(const package_spec& spec, install_plan_action&& plan) : spec(spec), plan(std::move(plan))
+    package_spec_with_install_plan::package_spec_with_install_plan(const PackageSpec& spec, install_plan_action&& plan) : spec(spec), plan(std::move(plan))
     {
     }
 
@@ -30,21 +30,21 @@ namespace vcpkg::Dependencies
     {
     }
 
-    package_spec_with_remove_plan::package_spec_with_remove_plan(const package_spec& spec, remove_plan_action&& plan)
+    package_spec_with_remove_plan::package_spec_with_remove_plan(const PackageSpec& spec, remove_plan_action&& plan)
         : spec(spec), plan(std::move(plan))
     {
     }
 
-    std::vector<package_spec_with_install_plan> create_install_plan(const vcpkg_paths& paths, const std::vector<package_spec>& specs, const StatusParagraphs& status_db)
+    std::vector<package_spec_with_install_plan> create_install_plan(const vcpkg_paths& paths, const std::vector<PackageSpec>& specs, const StatusParagraphs& status_db)
     {
-        std::unordered_map<package_spec, install_plan_action> was_examined; // Examine = we have checked its immediate (non-recursive) dependencies
-        Graphs::Graph<package_spec> graph;
+        std::unordered_map<PackageSpec, install_plan_action> was_examined; // Examine = we have checked its immediate (non-recursive) dependencies
+        Graphs::Graph<PackageSpec> graph;
         graph.add_vertices(specs);
 
-        std::vector<package_spec> examine_stack(specs);
+        std::vector<PackageSpec> examine_stack(specs);
         while (!examine_stack.empty())
         {
-            const package_spec spec = examine_stack.back();
+            const PackageSpec spec = examine_stack.back();
             examine_stack.pop_back();
 
             if (was_examined.find(spec) != was_examined.end())
@@ -56,7 +56,7 @@ namespace vcpkg::Dependencies
                 {
                     for (const std::string& dep_as_string : dependencies_as_string)
                     {
-                        const package_spec current_dep = package_spec::from_name_and_triplet(dep_as_string, spec.target_triplet()).value_or_exit(VCPKG_LINE_INFO);
+                        const PackageSpec current_dep = PackageSpec::from_name_and_triplet(dep_as_string, spec.target_triplet()).value_or_exit(VCPKG_LINE_INFO);
                         graph.add_edge(spec, current_dep);
                         if (was_examined.find(current_dep) == was_examined.end())
                         {
@@ -94,26 +94,26 @@ namespace vcpkg::Dependencies
 
         std::vector<package_spec_with_install_plan> ret;
 
-        const std::vector<package_spec> pkgs = graph.find_topological_sort();
-        for (const package_spec& pkg : pkgs)
+        const std::vector<PackageSpec> pkgs = graph.find_topological_sort();
+        for (const PackageSpec& pkg : pkgs)
         {
             ret.push_back(package_spec_with_install_plan(pkg, std::move(was_examined[pkg])));
         }
         return ret;
     }
 
-    std::vector<package_spec_with_remove_plan> create_remove_plan(const std::vector<package_spec>& specs, const StatusParagraphs& status_db)
+    std::vector<package_spec_with_remove_plan> create_remove_plan(const std::vector<PackageSpec>& specs, const StatusParagraphs& status_db)
     {
-        std::unordered_set<package_spec> specs_as_set(specs.cbegin(), specs.cend());
+        std::unordered_set<PackageSpec> specs_as_set(specs.cbegin(), specs.cend());
 
-        std::unordered_map<package_spec, remove_plan_action> was_examined; // Examine = we have checked its immediate (non-recursive) dependencies
-        Graphs::Graph<package_spec> graph;
+        std::unordered_map<PackageSpec, remove_plan_action> was_examined; // Examine = we have checked its immediate (non-recursive) dependencies
+        Graphs::Graph<PackageSpec> graph;
         graph.add_vertices(specs);
 
-        std::vector<package_spec> examine_stack(specs);
+        std::vector<PackageSpec> examine_stack(specs);
         while (!examine_stack.empty())
         {
-            const package_spec spec = examine_stack.back();
+            const PackageSpec spec = examine_stack.back();
             examine_stack.pop_back();
 
             if (was_examined.find(spec) != was_examined.end())
@@ -151,8 +151,8 @@ namespace vcpkg::Dependencies
 
         std::vector<package_spec_with_remove_plan> ret;
 
-        const std::vector<package_spec> pkgs = graph.find_topological_sort();
-        for (const package_spec& pkg : pkgs)
+        const std::vector<PackageSpec> pkgs = graph.find_topological_sort();
+        for (const PackageSpec& pkg : pkgs)
         {
             ret.push_back(package_spec_with_remove_plan(pkg, std::move(was_examined[pkg])));
         }