From e56d87c689ba4d8ac22b0b5840486790891e838c Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 16:01:09 -0700 Subject: Remove to_printf_args(PackageSpec) --- toolsrc/src/PackageSpec.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'toolsrc/src/PackageSpec.cpp') diff --git a/toolsrc/src/PackageSpec.cpp b/toolsrc/src/PackageSpec.cpp index fab0cc8b6..2eb5c1f23 100644 --- a/toolsrc/src/PackageSpec.cpp +++ b/toolsrc/src/PackageSpec.cpp @@ -65,11 +65,6 @@ namespace vcpkg return this->display_name(); } - std::string to_printf_arg(const PackageSpec& spec) - { - return spec.to_string(); - } - bool operator==(const PackageSpec& left, const PackageSpec& right) { return left.name() == right.name() && left.target_triplet() == right.target_triplet(); -- cgit v1.2.3 From 18fa18a07b97aa69826562738e498fbd2317e091 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 16:17:54 -0700 Subject: Remove PackageSpec.display_name() --- toolsrc/src/PackageSpec.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'toolsrc/src/PackageSpec.cpp') diff --git a/toolsrc/src/PackageSpec.cpp b/toolsrc/src/PackageSpec.cpp index 2eb5c1f23..cd68fab23 100644 --- a/toolsrc/src/PackageSpec.cpp +++ b/toolsrc/src/PackageSpec.cpp @@ -50,11 +50,6 @@ namespace vcpkg return this->m_target_triplet; } - std::string PackageSpec::display_name() const - { - return Strings::format("%s:%s", this->name(), this->target_triplet()); - } - std::string PackageSpec::dir() const { return Strings::format("%s_%s", this->m_name, this->m_target_triplet); @@ -62,7 +57,7 @@ namespace vcpkg std::string PackageSpec::to_string() const { - return this->display_name(); + return Strings::format("%s:%s", this->name(), this->target_triplet()); } bool operator==(const PackageSpec& left, const PackageSpec& right) -- cgit v1.2.3 From 41c9026875b3d05ee46ca83287aa6fca5b347165 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 16:20:24 -0700 Subject: Remove PackageSpec& operator<< overload --- toolsrc/src/PackageSpec.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'toolsrc/src/PackageSpec.cpp') diff --git a/toolsrc/src/PackageSpec.cpp b/toolsrc/src/PackageSpec.cpp index cd68fab23..a1b129b5c 100644 --- a/toolsrc/src/PackageSpec.cpp +++ b/toolsrc/src/PackageSpec.cpp @@ -64,9 +64,4 @@ namespace vcpkg { return left.name() == right.name() && left.target_triplet() == right.target_triplet(); } - - std::ostream& operator<<(std::ostream& os, const PackageSpec& spec) - { - return os << spec.to_string(); - } } -- cgit v1.2.3 From 410aa5b43a5fa995d8684590b119bbb04353a139 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:00:33 -0700 Subject: default_target_triplet -> default_triplet --- toolsrc/src/PackageSpec.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'toolsrc/src/PackageSpec.cpp') diff --git a/toolsrc/src/PackageSpec.cpp b/toolsrc/src/PackageSpec.cpp index a1b129b5c..c1ef9c56b 100644 --- a/toolsrc/src/PackageSpec.cpp +++ b/toolsrc/src/PackageSpec.cpp @@ -8,12 +8,12 @@ namespace vcpkg return (c == '-') || isdigit(c) || (isalpha(c) && islower(c)); } - Expected PackageSpec::from_string(const std::string& spec_as_string, const Triplet& default_target_triplet) + Expected PackageSpec::from_string(const std::string& spec_as_string, const Triplet& default_triplet) { auto pos = spec_as_string.find(':'); if (pos == std::string::npos) { - return from_name_and_triplet(spec_as_string, default_target_triplet); + return from_name_and_triplet(spec_as_string, default_triplet); } auto pos2 = spec_as_string.find(':', pos + 1); -- cgit v1.2.3 From 3e94a8db42804a6ac0cc71e5b74483ebd5958f83 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:03:34 -0700 Subject: PackageSpec.target_triplet() -> ".triplet() --- toolsrc/src/PackageSpec.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'toolsrc/src/PackageSpec.cpp') diff --git a/toolsrc/src/PackageSpec.cpp b/toolsrc/src/PackageSpec.cpp index c1ef9c56b..14da9db6c 100644 --- a/toolsrc/src/PackageSpec.cpp +++ b/toolsrc/src/PackageSpec.cpp @@ -45,7 +45,7 @@ namespace vcpkg return this->m_name; } - const Triplet& PackageSpec::target_triplet() const + const Triplet& PackageSpec::triplet() const { return this->m_target_triplet; } @@ -57,11 +57,11 @@ namespace vcpkg std::string PackageSpec::to_string() const { - return Strings::format("%s:%s", this->name(), this->target_triplet()); + return Strings::format("%s:%s", this->name(), this->triplet()); } bool operator==(const PackageSpec& left, const PackageSpec& right) { - return left.name() == right.name() && left.target_triplet() == right.target_triplet(); + return left.name() == right.name() && left.triplet() == right.triplet(); } } -- cgit v1.2.3 From 6699737c6d1b9e33c4448080c006317333b1e969 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:04:34 -0700 Subject: [PackageSpec] target_triplet -> triplet --- toolsrc/src/PackageSpec.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'toolsrc/src/PackageSpec.cpp') 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 -- cgit v1.2.3