Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMartin Hořeňovský2020-05-07 21:30:43 +0200
committerMartin Hořeňovský2020-05-09 18:00:51 +0200
commit75b711a36061f5ddd2516f937a5c9bc44ef9ae8f (patch)
tree1a38954917b48a8aee880b58e1f15e62eebb9ac7 /src
parentdb32550898ac0b7bdb81228972f6ba58b88ce18d (diff)
downloadcatch3-75b711a36061f5ddd2516f937a5c9bc44ef9ae8f.tar.gz
Fix ODR violation because of name clash in matchers
Diffstat (limited to 'src')
-rw-r--r--src/catch2/matchers/catch_matchers_vector.hpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/catch2/matchers/catch_matchers_vector.hpp b/src/catch2/matchers/catch_matchers_vector.hpp
index 71634813..41fd6939 100644
--- a/src/catch2/matchers/catch_matchers_vector.hpp
+++ b/src/catch2/matchers/catch_matchers_vector.hpp
@@ -17,9 +17,9 @@ namespace Catch {
namespace Matchers {
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)
{}
@@ -168,8 +168,8 @@ namespace Matchers {
//! Creates a matcher that matches vectors that contain `comparator` as an element
template<typename T, typename Alloc = std::allocator<T>>
- ContainsElementMatcher<T, Alloc> VectorContains( T const& comparator ) {
- return ContainsElementMatcher<T, Alloc>(comparator);
+ VectorContainsElementMatcher<T, Alloc> VectorContains( T const& comparator ) {
+ return VectorContainsElementMatcher<T, Alloc>(comparator);
}
//! Creates a matcher that matches vectors that are exactly equal to `comparator`