diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-10-16 13:54:38 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-10-16 13:54:38 -0700 |
| commit | 61777425db2c5f59eb3a44f4439b734c27932cba (patch) | |
| tree | b30c886e7037f866acd8bcfb3d9faa67b052338c | |
| parent | c797ab4794b022f9f2a53f9a80bd6a451bd6d1ee (diff) | |
| download | vcpkg-61777425db2c5f59eb3a44f4439b734c27932cba.tar.gz vcpkg-61777425db2c5f59eb3a44f4439b734c27932cba.zip | |
Remove CharType template paramter from Strings::join()
| -rw-r--r-- | toolsrc/include/vcpkg/base/strings.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/toolsrc/include/vcpkg/base/strings.h b/toolsrc/include/vcpkg/base/strings.h index 6a4d4ef08..d263e3b6b 100644 --- a/toolsrc/include/vcpkg/base/strings.h +++ b/toolsrc/include/vcpkg/base/strings.h @@ -48,18 +48,18 @@ namespace vcpkg::Strings bool case_insensitive_ascii_starts_with(const std::string& s, const std::string& pattern); - template<class Container, class Transformer, class CharType> - std::basic_string<CharType> join(const CharType* delimiter, const Container& v, Transformer transformer) + template<class Container, class Transformer> + std::string join(const char* delimiter, const Container& v, Transformer transformer) { const auto begin = v.begin(); const auto end = v.end(); if (begin == end) { - return std::basic_string<CharType>(); + return std::string(); } - std::basic_string<CharType> output; + std::string output; output.append(transformer(*begin)); for (auto it = std::next(begin); it != end; ++it) { @@ -69,8 +69,8 @@ namespace vcpkg::Strings return output; } - template<class Container, class CharType> - std::basic_string<CharType> join(const CharType* delimiter, const Container& v) + template<class Container> + std::string join(const char* delimiter, const Container& v) { using Element = decltype(*v.begin()); return join(delimiter, v, [](const Element& x) -> const Element& { return x; }); |
