Merge pull request #2085 from LukeCz/patch-2
Fix for: failed build on centos6 master #1587
This commit is contained in:
commit
4fe76c4d6e
@ -3033,7 +3033,7 @@ class PointwiseMatcher {
|
|||||||
operator Matcher<LhsContainer>() const {
|
operator Matcher<LhsContainer>() const {
|
||||||
GTEST_COMPILE_ASSERT_(
|
GTEST_COMPILE_ASSERT_(
|
||||||
!IsHashTable<GTEST_REMOVE_REFERENCE_AND_CONST_(LhsContainer)>::value,
|
!IsHashTable<GTEST_REMOVE_REFERENCE_AND_CONST_(LhsContainer)>::value,
|
||||||
use_UnorderedPointwise_with_hash_tables);
|
use_UnorderedPointwise_with_hash_tables_);
|
||||||
|
|
||||||
return MakeMatcher(new Impl<LhsContainer>(tuple_matcher_, rhs_));
|
return MakeMatcher(new Impl<LhsContainer>(tuple_matcher_, rhs_));
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user