3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 19:25:27 +08:00
Code Issues Projects Releases Wiki Activity

Introduce Vectors::concatenate()

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-10-15 23:53:35 -07:00
parent e46ec53693
commit 798f8a91e4
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
toolsrc/include/vcpkg/base/util.h
View File

@ -7,6 +7,18 @@
namespace vcpkg::Util
{
template<class Container>
using ElementT = std::remove_reference_t<decltype(*begin(std::declval<Container>()))>;
namespace Vectors
{
template<class Container, class T = ElementT<Container>>
void concatenate(std::vector<T>* augend, const Container& addend)
{
augend->insert(augend->end(), addend.begin(), addend.end());
}
}
template<class Cont, class Func>
using FmapOut = decltype(std::declval<Func>()(*begin(std::declval<Cont>())));
@ -71,9 +83,6 @@ namespace vcpkg::Util
return std::find_if(begin(cont), end(cont), pred);
}
template<class Container>
using ElementT = std::remove_reference_t<decltype(*begin(std::declval<Container>()))>;
template<class Container, class T = ElementT<Container>>
std::vector<T*> element_pointers(Container&& cont)
{
@ -153,4 +162,4 @@ namespace vcpkg::Util
std::unique_lock<std::mutex> m_lock;
T& m_ptr;
};
}
}

2
toolsrc/src/vcpkg/install.cpp
View File

@ -145,7 +145,7 @@ namespace vcpkg::Install
continue;
}
output.insert(output.end(), t.files.begin(), t.files.end());
Util::Vectors::concatenate(&output, t.files);
}
std::sort(output.begin(), output.end());