eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for: failed build on centos6 master #1587

Browse Source 
The issue still exists in 1.8.1 and NOT in master branch. It was introduced to 1.8.1 only by #1512.
This code
GTEST_COMPILE_ASSERT_(
!IsHashTable<GTEST_REMOVE_REFERENCE_AND_CONST_(LhsContainer)>::value,
use_UnorderedPointwise_with_hash_tables);

Creates 2nd variable use_UnorderedPointwise_with_hash_tables.
This commit is contained in:
Lukasz Czajczyk 2019-01-27 09:06:54 -06:00 committed by GitHub
parent be8475fdf7
commit 049a0d74b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
googlemock/include/gmock/gmock-matchers.h
View File

@ -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_));
} }