aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/include
diff options
context:
space:
mode:
Diffstat (limited to 'toolsrc/include')
-rw-r--r--toolsrc/include/BinaryParagraph.h2
-rw-r--r--toolsrc/include/PackageSpec.h12
-rw-r--r--toolsrc/include/SourceParagraph.h4
-rw-r--r--toolsrc/include/StatusParagraphs.h6
-rw-r--r--toolsrc/include/triplet.h28
-rw-r--r--toolsrc/include/vcpkg_Commands.h16
-rw-r--r--toolsrc/include/vcpkg_Input.h4
-rw-r--r--toolsrc/include/vcpkg_paths.h2
8 files changed, 37 insertions, 37 deletions
diff --git a/toolsrc/include/BinaryParagraph.h b/toolsrc/include/BinaryParagraph.h
index f0f7b092b..d92ae7e6d 100644
--- a/toolsrc/include/BinaryParagraph.h
+++ b/toolsrc/include/BinaryParagraph.h
@@ -10,7 +10,7 @@ namespace vcpkg
{
BinaryParagraph();
explicit BinaryParagraph(std::unordered_map<std::string, std::string> fields);
- BinaryParagraph(const SourceParagraph& spgh, const triplet& target_triplet);
+ BinaryParagraph(const SourceParagraph& spgh, const Triplet& target_triplet);
std::string displayname() const;
diff --git a/toolsrc/include/PackageSpec.h b/toolsrc/include/PackageSpec.h
index 4efd7a9ed..393e32f14 100644
--- a/toolsrc/include/PackageSpec.h
+++ b/toolsrc/include/PackageSpec.h
@@ -1,19 +1,19 @@
#pragma once
#include "PackageSpecParseResult.h"
-#include "triplet.h"
+#include "Triplet.h"
#include "vcpkg_expected.h"
namespace vcpkg
{
struct PackageSpec
{
- static expected<PackageSpec> from_string(const std::string& spec_as_string, const triplet& default_target_triplet);
+ static expected<PackageSpec> from_string(const std::string& spec_as_string, const Triplet& default_target_triplet);
- static expected<PackageSpec> from_name_and_triplet(const std::string& name, const triplet& target_triplet);
+ static expected<PackageSpec> from_name_and_triplet(const std::string& name, const Triplet& target_triplet);
const std::string& name() const;
- const triplet& target_triplet() const;
+ const Triplet& target_triplet() const;
std::string display_name() const;
@@ -23,7 +23,7 @@ namespace vcpkg
private:
std::string m_name;
- triplet m_target_triplet;
+ Triplet m_target_triplet;
};
std::string to_printf_arg(const PackageSpec& spec);
@@ -42,7 +42,7 @@ namespace std
{
size_t hash = 17;
hash = hash * 31 + std::hash<std::string>()(value.name());
- hash = hash * 31 + std::hash<vcpkg::triplet>()(value.target_triplet());
+ hash = hash * 31 + std::hash<vcpkg::Triplet>()(value.target_triplet());
return hash;
}
};
diff --git a/toolsrc/include/SourceParagraph.h b/toolsrc/include/SourceParagraph.h
index 5ae9b38b8..76b17bd40 100644
--- a/toolsrc/include/SourceParagraph.h
+++ b/toolsrc/include/SourceParagraph.h
@@ -5,7 +5,7 @@
namespace vcpkg
{
- struct triplet;
+ struct Triplet;
struct dependency
{
@@ -28,7 +28,7 @@ namespace vcpkg
std::vector<dependency> depends;
};
- std::vector<std::string> filter_dependencies(const std::vector<vcpkg::dependency>& deps, const triplet& t);
+ std::vector<std::string> filter_dependencies(const std::vector<vcpkg::dependency>& deps, const Triplet& t);
std::vector<vcpkg::dependency> expand_qualified_dependencies(const std::vector<std::string>& depends);
std::vector<std::string> parse_depends(const std::string& depends_string);
diff --git a/toolsrc/include/StatusParagraphs.h b/toolsrc/include/StatusParagraphs.h
index fc6a96a54..cdf6b8e8e 100644
--- a/toolsrc/include/StatusParagraphs.h
+++ b/toolsrc/include/StatusParagraphs.h
@@ -18,9 +18,9 @@ namespace vcpkg
{
return find(spec.name(), spec.target_triplet());
}
- const_iterator find(const std::string& name, const triplet& target_triplet) const;
- iterator find(const std::string& name, const triplet& target_triplet);
- const_iterator find_installed(const std::string& name, const triplet& target_triplet) const;
+ const_iterator find(const std::string& name, const Triplet& target_triplet) const;
+ iterator find(const std::string& name, const Triplet& target_triplet);
+ const_iterator find_installed(const std::string& name, const Triplet& target_triplet) const;
iterator insert(std::unique_ptr<StatusParagraph>);
diff --git a/toolsrc/include/triplet.h b/toolsrc/include/triplet.h
index 614b3b909..8cf2413b0 100644
--- a/toolsrc/include/triplet.h
+++ b/toolsrc/include/triplet.h
@@ -4,15 +4,15 @@
namespace vcpkg
{
- struct triplet
+ struct Triplet
{
- static triplet from_canonical_name(const std::string& triplet_as_string);
+ static Triplet from_canonical_name(const std::string& triplet_as_string);
- static const triplet X86_WINDOWS;
- static const triplet X64_WINDOWS;
- static const triplet X86_UWP;
- static const triplet X64_UWP;
- static const triplet ARM_UWP;
+ static const Triplet X86_WINDOWS;
+ static const Triplet X64_WINDOWS;
+ static const Triplet X86_UWP;
+ static const Triplet X64_UWP;
+ static const Triplet ARM_UWP;
const std::string& canonical_name() const;
@@ -24,23 +24,23 @@ namespace vcpkg
std::string m_canonical_name;
};
- bool operator==(const triplet& left, const triplet& right);
+ bool operator==(const Triplet& left, const Triplet& right);
- bool operator!=(const triplet& left, const triplet& right);
+ bool operator!=(const Triplet& left, const Triplet& right);
- std::string to_string(const triplet& spec);
+ std::string to_string(const Triplet& spec);
- std::string to_printf_arg(const triplet& spec);
+ std::string to_printf_arg(const Triplet& spec);
- std::ostream& operator<<(std::ostream& os, const triplet& spec);
+ std::ostream& operator<<(std::ostream& os, const Triplet& spec);
}
namespace std
{
template <>
- struct hash<vcpkg::triplet>
+ struct hash<vcpkg::Triplet>
{
- size_t operator()(const vcpkg::triplet& t) const
+ size_t operator()(const vcpkg::Triplet& t) const
{
std::hash<std::string> hasher;
size_t hash = 17;
diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h
index 0795a8405..985657a94 100644
--- a/toolsrc/include/vcpkg_Commands.h
+++ b/toolsrc/include/vcpkg_Commands.h
@@ -8,7 +8,7 @@
namespace vcpkg::Commands
{
- using command_type_a = void(*)(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet);
+ using command_type_a = void(*)(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet);
using command_type_b = void(*)(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
using command_type_c = void(*)(const vcpkg_cmd_arguments& args);
@@ -29,32 +29,32 @@ namespace vcpkg::Commands
std::string create_error_message(const BuildResult build_result, const PackageSpec& spec);
std::string create_user_troubleshooting_message(const PackageSpec& spec);
- std::wstring make_build_env_cmd(const triplet& target_triplet, const toolset_t& toolset);
+ std::wstring make_build_env_cmd(const Triplet& target_triplet, const toolset_t& toolset);
BuildResult build_package(const SourceParagraph& source_paragraph, const PackageSpec& spec, const vcpkg_paths& paths, const fs::path& port_dir, const StatusParagraphs& status_db);
void perform_and_exit(const PackageSpec& spec, const fs::path& port_dir, const std::unordered_set<std::string>& options, const vcpkg_paths& paths);
- void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet);
+ void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet);
}
namespace BuildExternal
{
- void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet);
+ void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet);
}
namespace Install
{
void install_package(const vcpkg_paths& paths, const BinaryParagraph& binary_paragraph, StatusParagraphs* status_db);
- void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet);
+ void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet);
}
namespace CI
{
- void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet);
+ void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet);
}
namespace Remove
{
- void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet);
+ void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet);
}
namespace Update
@@ -73,7 +73,7 @@ namespace vcpkg::Commands
namespace Env
{
- void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_triplet);
+ void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const Triplet& default_triplet);
}
namespace Create
diff --git a/toolsrc/include/vcpkg_Input.h b/toolsrc/include/vcpkg_Input.h
index da7bebbfa..5e1d1f0fa 100644
--- a/toolsrc/include/vcpkg_Input.h
+++ b/toolsrc/include/vcpkg_Input.h
@@ -7,8 +7,8 @@ namespace vcpkg::Input
{
PackageSpec check_and_get_package_spec(
const std::string& package_spec_as_string,
- const triplet& default_target_triplet,
+ const Triplet& default_target_triplet,
CStringView example_text);
- void check_triplet(const triplet& t, const vcpkg_paths& paths);
+ void check_triplet(const Triplet& t, const vcpkg_paths& paths);
}
diff --git a/toolsrc/include/vcpkg_paths.h b/toolsrc/include/vcpkg_paths.h
index fa74fd703..c6ed34937 100644
--- a/toolsrc/include/vcpkg_paths.h
+++ b/toolsrc/include/vcpkg_paths.h
@@ -23,7 +23,7 @@ namespace vcpkg
fs::path build_info_file_path(const PackageSpec& spec) const;
fs::path listfile_path(const BinaryParagraph& pgh) const;
- bool is_valid_triplet(const triplet& t) const;
+ bool is_valid_triplet(const Triplet& t) const;
fs::path root;
fs::path packages;
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-28 16:12:02 +0000