Merge from master

1 files changed, 5 insertions, 15 deletions

diff --git a/toolsrc/src/triplet.cpp b/toolsrc/src/triplet.cpp
index 0aacec9a0..cbdafb14c 100644
--- a/toolsrc/src/triplet.cpp
+++ b/toolsrc/src/triplet.cpp
@@ -11,16 +11,6 @@ namespace vcpkg
     const Triplet Triplet::X64_UWP = from_canonical_name("x64-uwp");
     const Triplet Triplet::ARM_UWP = from_canonical_name("arm-uwp");
 
-    std::string to_string(const Triplet& t)
-    {
-        return t.canonical_name();
-    }
-
-    std::string to_printf_arg(const Triplet& t)
-    {
-        return to_string(t);
-    }
-
     bool operator==(const Triplet& left, const Triplet& right)
     {
         return left.canonical_name() == right.canonical_name();
@@ -31,11 +21,6 @@ namespace vcpkg
         return !(left == right);
     }
 
-    std::ostream& operator<<(std::ostream& os, const Triplet& t)
-    {
-        return os << to_string(t);
-    }
-
     Triplet Triplet::from_canonical_name(const std::string& triplet_as_string)
     {
         const std::string s(Strings::ascii_to_lowercase(triplet_as_string));
@@ -63,4 +48,9 @@ namespace vcpkg
         auto it = std::find(this->m_canonical_name.cbegin(), this->m_canonical_name.cend(), '-');
         return std::string(it + 1, this->m_canonical_name.cend());
     }
+
+    const std::string& Triplet::to_string() const
+    {
+        return this->m_canonical_name;
+    }
 }