From 6699737c6d1b9e33c4448080c006317333b1e969 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:04:34 -0700 Subject: [PATCH] [PackageSpec] target_triplet -> triplet --- toolsrc/include/PackageSpec.h | 4 ++-- toolsrc/src/PackageSpec.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/toolsrc/include/PackageSpec.h b/toolsrc/include/PackageSpec.h index fa6b2c5f5..4c3b47365 100644 --- a/toolsrc/include/PackageSpec.h +++ b/toolsrc/include/PackageSpec.h @@ -9,7 +9,7 @@ namespace vcpkg { static Expected from_string(const std::string& spec_as_string, const Triplet& default_triplet); - static Expected from_name_and_triplet(const std::string& name, const Triplet& target_triplet); + static Expected from_name_and_triplet(const std::string& name, const Triplet& triplet); const std::string& name() const; @@ -21,7 +21,7 @@ namespace vcpkg private: std::string m_name; - Triplet m_target_triplet; + Triplet m_triplet; }; bool operator==(const PackageSpec& left, const PackageSpec& right); diff --git a/toolsrc/src/PackageSpec.cpp b/toolsrc/src/PackageSpec.cpp index 14da9db6c..bf1c7380c 100644 --- a/toolsrc/src/PackageSpec.cpp +++ b/toolsrc/src/PackageSpec.cpp @@ -23,11 +23,11 @@ namespace vcpkg } const std::string name = spec_as_string.substr(0, pos); - const Triplet target_triplet = Triplet::from_canonical_name(spec_as_string.substr(pos + 1)); - return from_name_and_triplet(name, target_triplet); + const Triplet triplet = Triplet::from_canonical_name(spec_as_string.substr(pos + 1)); + return from_name_and_triplet(name, triplet); } - Expected PackageSpec::from_name_and_triplet(const std::string& name, const Triplet& target_triplet) + Expected PackageSpec::from_name_and_triplet(const std::string& name, const Triplet& triplet) { if (std::find_if_not(name.cbegin(), name.cend(), is_valid_package_spec_char) != name.end()) { @@ -36,7 +36,7 @@ namespace vcpkg PackageSpec p; p.m_name = name; - p.m_target_triplet = target_triplet; + p.m_triplet = triplet; return p; } @@ -47,12 +47,12 @@ namespace vcpkg const Triplet& PackageSpec::triplet() const { - return this->m_target_triplet; + return this->m_triplet; } std::string PackageSpec::dir() const { - return Strings::format("%s_%s", this->m_name, this->m_target_triplet); + return Strings::format("%s_%s", this->m_name, this->m_triplet); } std::string PackageSpec::to_string() const