3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-11-02 21:19:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix and extend tests for composing generic matchers

Browse Source
This commit is contained in:
Martin Hořeňovský
2020-03-28 22:01:17 +01:00
parent ca5af2e85b
commit f7d7aa9eb2
8 changed files with 120 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/catch2/matchers/catch_matchers_templated.hpp
View File

@@ -41,7 +41,7 @@ namespace Matchers {
template<std::size_t N>
std::array<void const*, N+1> array_cat(void const* lhs, std::array<void const*, N> && rhs) {
std::array<void const*, N+1> arr{lhs};
std::array<void const*, N + 1> arr{ {lhs} };
std::copy_n(rhs.begin(), N, arr.begin() + 1);
return arr;
}
@@ -129,6 +129,7 @@ namespace Matchers {
}
std::array<void const*, sizeof...(MatcherTs)> m_matchers;
};