Skip to content

G
googletest
Unverified Commit 4fe76c4d by Gennadiy Civil Committed by GitHub
Options

Merge pull request #2085 from LukeCz/patch-2

Fix for: failed build on centos6 master #1587
parents be8475fd 049a0d74
Showing with 1 addition and 1 deletion
googlemock/include/gmock/gmock-matchers.h
...@@ -3033,7 +3033,7 @@ class PointwiseMatcher { ...@@ -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_));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment