diff options
| author | Lukasz Czajczyk <LukeCz@users.noreply.github.com> | 2019-01-27 15:06:54 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-27 15:06:54 (GMT) |
| commit | 049a0d74b02f027908895badf8e6d9715ada2559 (patch) | |
| tree | 864a7bedbca7647efbc701306846d2fb59ff2efd | |
| parent | be8475fdf7599cfdd7bd53224bd4d192d1f58766 (diff) | |
| download | googletest-049a0d74b02f027908895badf8e6d9715ada2559.zip googletest-049a0d74b02f027908895badf8e6d9715ada2559.tar.gz googletest-049a0d74b02f027908895badf8e6d9715ada2559.tar.bz2 | |
Fix for: failed build on centos6 master #1587refs/pull/2085/head
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.
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 41d7252..6dab03a 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -3033,7 +3033,7 @@ class PointwiseMatcher { operator Matcher<LhsContainer>() const { GTEST_COMPILE_ASSERT_( !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_)); } |