diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2019-01-28 17:01:12 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-28 17:01:12 (GMT) |
| commit | 4fe76c4d6e667ba588a3868d052a2aa4b423afa3 (patch) | |
| tree | 864a7bedbca7647efbc701306846d2fb59ff2efd /googlemock | |
| parent | be8475fdf7599cfdd7bd53224bd4d192d1f58766 (diff) | |
| parent | 049a0d74b02f027908895badf8e6d9715ada2559 (diff) | |
| download | googletest-4fe76c4d6e667ba588a3868d052a2aa4b423afa3.zip googletest-4fe76c4d6e667ba588a3868d052a2aa4b423afa3.tar.gz googletest-4fe76c4d6e667ba588a3868d052a2aa4b423afa3.tar.bz2 | |
Merge pull request #2085 from LukeCz/patch-2
Fix for: failed build on centos6 master #1587
Diffstat (limited to 'googlemock')
| -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_)); } |