3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ODR violation because of name clash in matchers

This commit is contained in:
Martin Hořeňovský 2020-05-07 21:30:43 +02:00
parent db32550898
commit 75b711a360
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/catch2/matchers/catch_matchers_vector.hpp
View File

@ -17,9 +17,9 @@ namespace Catch {
namespace Matchers { namespace Matchers {
template<typename T, typename Alloc> template<typename T, typename Alloc>
struct ContainsElementMatcher final : MatcherBase<std::vector<T, Alloc>> { struct VectorContainsElementMatcher final : MatcherBase<std::vector<T, Alloc>> {
ContainsElementMatcher(T const& comparator): VectorContainsElementMatcher(T const& comparator):
m_comparator(comparator) m_comparator(comparator)
{} {}
@ -168,8 +168,8 @@ namespace Matchers {
//! Creates a matcher that matches vectors that contain `comparator` as an element //! Creates a matcher that matches vectors that contain `comparator` as an element
template<typename T, typename Alloc = std::allocator<T>> template<typename T, typename Alloc = std::allocator<T>>
ContainsElementMatcher<T, Alloc> VectorContains( T const& comparator ) { VectorContainsElementMatcher<T, Alloc> VectorContains( T const& comparator ) {
return ContainsElementMatcher<T, Alloc>(comparator); return VectorContainsElementMatcher<T, Alloc>(comparator);
} }
//! Creates a matcher that matches vectors that are exactly equal to `comparator` //! Creates a matcher that matches vectors that are exactly equal to `comparator`