diff options
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/Paragraphs.cpp | 4 | ||||
| -rw-r--r-- | toolsrc/src/commands_portsdiff.cpp | 20 | ||||
| -rw-r--r-- | toolsrc/src/commands_update.cpp | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/toolsrc/src/Paragraphs.cpp b/toolsrc/src/Paragraphs.cpp index 0d91e95a9..61da7a866 100644 --- a/toolsrc/src/Paragraphs.cpp +++ b/toolsrc/src/Paragraphs.cpp @@ -250,9 +250,9 @@ namespace vcpkg::Paragraphs return output; } - std::map<std::string, version_t> extract_port_names_and_versions(const std::vector<SourceParagraph>& source_paragraphs) + std::map<std::string, VersionT> extract_port_names_and_versions(const std::vector<SourceParagraph>& source_paragraphs) { - std::map<std::string, version_t> names_and_versions; + std::map<std::string, VersionT> names_and_versions; for (const SourceParagraph& port : source_paragraphs) { names_and_versions.emplace(port.name, port.version); diff --git a/toolsrc/src/commands_portsdiff.cpp b/toolsrc/src/commands_portsdiff.cpp index 8f1b59170..c1110b522 100644 --- a/toolsrc/src/commands_portsdiff.cpp +++ b/toolsrc/src/commands_portsdiff.cpp @@ -39,14 +39,14 @@ namespace vcpkg::Commands::PortsDiff }; static std::vector<updated_port> find_updated_ports(const std::vector<std::string>& ports, - const std::map<std::string, version_t>& previous_names_and_versions, - const std::map<std::string, version_t>& current_names_and_versions) + const std::map<std::string, VersionT>& previous_names_and_versions, + const std::map<std::string, VersionT>& current_names_and_versions) { std::vector<updated_port> output; for (const std::string& name : ports) { - const version_t& previous_version = previous_names_and_versions.at(name); - const version_t& current_version = current_names_and_versions.at(name); + const VersionT& previous_version = previous_names_and_versions.at(name); + const VersionT& current_version = current_names_and_versions.at(name); if (previous_version == current_version) { continue; @@ -58,16 +58,16 @@ namespace vcpkg::Commands::PortsDiff return output; } - static void do_print_name_and_version(const std::vector<std::string>& ports_to_print, const std::map<std::string, version_t>& names_and_versions) + static void do_print_name_and_version(const std::vector<std::string>& ports_to_print, const std::map<std::string, VersionT>& names_and_versions) { for (const std::string& name : ports_to_print) { - const version_t& version = names_and_versions.at(name); + const VersionT& version = names_and_versions.at(name); System::println("%-20s %-16s", name, version); } } - static std::map<std::string, version_t> read_ports_from_commit(const vcpkg_paths& paths, const std::wstring& git_commit_id) + static std::map<std::string, VersionT> read_ports_from_commit(const vcpkg_paths& paths, const std::wstring& git_commit_id) { const fs::path& git_exe = paths.get_git_exe(); const fs::path dot_git_dir = paths.root / ".git"; @@ -86,7 +86,7 @@ namespace vcpkg::Commands::PortsDiff git_exe.native()); System::cmd_execute_clean(cmd); const std::vector<SourceParagraph> source_paragraphs = Paragraphs::load_all_ports(temp_checkout_path / ports_dir_name_as_string); - const std::map<std::string, version_t> names_and_versions = Paragraphs::extract_port_names_and_versions(source_paragraphs); + const std::map<std::string, VersionT> names_and_versions = Paragraphs::extract_port_names_and_versions(source_paragraphs); fs::remove_all(temp_checkout_path); return names_and_versions; } @@ -115,8 +115,8 @@ namespace vcpkg::Commands::PortsDiff check_commit_exists(git_exe, git_commit_id_for_current_snapshot); check_commit_exists(git_exe, git_commit_id_for_previous_snapshot); - const std::map<std::string, version_t> current_names_and_versions = read_ports_from_commit(paths, git_commit_id_for_current_snapshot); - const std::map<std::string, version_t> previous_names_and_versions = read_ports_from_commit(paths, git_commit_id_for_previous_snapshot); + const std::map<std::string, VersionT> current_names_and_versions = read_ports_from_commit(paths, git_commit_id_for_current_snapshot); + const std::map<std::string, VersionT> previous_names_and_versions = read_ports_from_commit(paths, git_commit_id_for_previous_snapshot); // Already sorted, so set_difference can work on std::vector too std::vector<std::string> current_ports = Maps::extract_keys(current_names_and_versions); diff --git a/toolsrc/src/commands_update.cpp b/toolsrc/src/commands_update.cpp index a4cb63439..845813488 100644 --- a/toolsrc/src/commands_update.cpp +++ b/toolsrc/src/commands_update.cpp @@ -15,7 +15,7 @@ namespace vcpkg::Commands::Update std::vector<OutdatedPackage> find_outdated_packages(const vcpkg_paths& paths, const StatusParagraphs& status_db) { const std::vector<SourceParagraph> source_paragraphs = Paragraphs::load_all_ports(paths.ports); - const std::map<std::string, version_t> src_names_to_versions = Paragraphs::extract_port_names_and_versions(source_paragraphs); + const std::map<std::string, VersionT> src_names_to_versions = Paragraphs::extract_port_names_and_versions(source_paragraphs); const std::vector<StatusParagraph*> installed_packages = get_installed_ports(status_db); std::vector<OutdatedPackage> output; |