Nuke Joiner. Add wjoin()

1 files changed, 4 insertions, 28 deletions

diff --git a/toolsrc/src/vcpkg_Strings.cpp b/toolsrc/src/vcpkg_Strings.cpp
index a7805f211..044fd3c05 100644
--- a/toolsrc/src/vcpkg_Strings.cpp
+++ b/toolsrc/src/vcpkg_Strings.cpp
@@ -78,38 +78,14 @@ namespace vcpkg::Strings
         return output;
     }
 
-    std::string join(const std::vector<std::string>& v, const std::string& prefix, const std::string& delimiter, const std::string& suffix)
+    std::string join(const std::string& delimiter, const std::vector<std::string>& v)
     {
-        return join(v, prefix, delimiter, suffix, [](const std::string& i) -> std::string
-        {
-            return i;
-        });
-    }
-
-    Joiner Joiner::on(const std::string& delimiter)
-    {
-        return Joiner(delimiter);
-    }
-
-    Joiner& Joiner::prefix(const std::string& prefix)
-    {
-        this->m_prefix = prefix;
-        return *this;
-    }
-
-    Joiner& Joiner::suffix(const std::string& suffix)
-    {
-        this->m_suffix = suffix;
-        return *this;
-    }
-
-    std::string Joiner::join(const std::vector<std::string>& v) const
-    {
-        return Strings::join(v, this->m_prefix, this->m_delimiter, this->m_suffix);
+        return join(delimiter, v, [](const std::string& p) -> const std::string& { return p; });
     }
 
-    Joiner::Joiner(const std::string& delimiter) : m_prefix(""), m_delimiter(delimiter), m_suffix("")
+    std::wstring wjoin(const std::wstring& delimiter, const std::vector<std::wstring>& v)
     {
+        return wjoin(delimiter, v, [](const std::wstring& p) -> const std::wstring&{ return p; });
     }
 
     void trim(std::string* s)