From aae15bd468c9b94118dc7d93c4c4a9856912bcc3 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Sat, 1 Apr 2017 01:38:32 -0700 Subject: [vcpkg] Collapse join() overloads into a single template. --- toolsrc/src/vcpkg_Strings.cpp | 10 ---------- toolsrc/src/vcpkglib.cpp | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) (limited to 'toolsrc/src') 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& v) - { - return join(delimiter, v, [](const std::string& p) -> const std::string& { return p; }); - } - - std::wstring wjoin(const std::wstring& delimiter, const std::vector& 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& 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()); } } -- cgit v1.2.3