[vcpkg] Collapse join() overloads into a single template.

2 files changed, 1 insertions, 11 deletions

diff --git a/toolsrc/src/vcpkg_Strings.cpp b/toolsrc/src/vcpkg_Strings.cpp
index 52f32bfa4..4878a02f4 100644
--- a/toolsrc/src/vcpkg_Strings.cpp
+++ b/toolsrc/src/vcpkg_Strings.cpp
@@ -78,16 +78,6 @@ namespace vcpkg::Strings
         return output;
     }
 
-    std::string join(const std::string& delimiter, const std::vector<std::string>& v)
-    {
-        return join(delimiter, v, [](const std::string& p) -> const std::string& { return p; });
-    }
-
-    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)
     {
         s->erase(std::find_if_not(s->rbegin(), s->rend(), details::isspace).base(), s->end());
diff --git a/toolsrc/src/vcpkglib.cpp b/toolsrc/src/vcpkglib.cpp
index 1f638dc49..47592ea1d 100644
--- a/toolsrc/src/vcpkglib.cpp
+++ b/toolsrc/src/vcpkglib.cpp
@@ -222,7 +222,7 @@ namespace vcpkg
 
     std::wstring make_cmake_cmd(const fs::path& cmake_exe, const fs::path& cmake_script, const std::vector<CMakeVariable>& pass_variables)
     {
-        std::wstring cmd_cmake_pass_variables = Strings::wjoin(L" ", pass_variables, [](auto&& v) { return v.s; });
+        std::wstring cmd_cmake_pass_variables = Strings::join(L" ", pass_variables, [](auto&& v) { return v.s; });
         return Strings::wformat(LR"("%s" %s -P "%s")", cmake_exe.native(), cmd_cmake_pass_variables, cmake_script.generic_wstring());
     }
 }