diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-04-09 15:55:20 -0700 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-04-09 15:55:20 -0700 |
| commit | 1db72cd0eaef8c97f2d5f99ea337878f9cc67eec (patch) | |
| tree | a10cb42a871ab2262c712966d53f1398625c8e44 /toolsrc/include | |
| parent | b1b7ec5c0be3a3b00071b8fccc0a5ec90a8e78ea (diff) | |
| download | vcpkg-1db72cd0eaef8c97f2d5f99ea337878f9cc67eec.tar.gz vcpkg-1db72cd0eaef8c97f2d5f99ea337878f9cc67eec.zip | |
Revert "Print what port installed confliciting files"
This reverts commit 79682317c9e087dc1d1ae450e3edd03b0fa0cc59.
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/vcpkg/base/strings.h | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/toolsrc/include/vcpkg/base/strings.h b/toolsrc/include/vcpkg/base/strings.h index 3165dc8ee..16876cf5c 100644 --- a/toolsrc/include/vcpkg/base/strings.h +++ b/toolsrc/include/vcpkg/base/strings.h @@ -112,10 +112,12 @@ namespace vcpkg::Strings bool ends_with(StringView s, StringView pattern); bool starts_with(StringView s, StringView pattern); - template<class InputIterator, class Transformer> - std::string join(const char* delimiter, InputIterator begin, InputIterator end, - 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::string(); @@ -131,24 +133,6 @@ namespace vcpkg::Strings return output; } - - 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(); - - return join(delimiter, begin, end, transformer); - } - - template<class InputIterator> - std::string join(const char* delimiter, InputIterator begin, InputIterator end) - { - using Element = decltype(*begin); - return join(delimiter, begin, end, - [](const Element& x) -> const Element& { return x; }); - } - template<class Container> std::string join(const char* delimiter, const Container& v) { |
