From 049a0d74b02f027908895badf8e6d9715ada2559 Mon Sep 17 00:00:00 2001 From: Lukasz Czajczyk Date: Sun, 27 Jan 2019 09:06:54 -0600 Subject: [PATCH] Fix for: failed build on centos6 master #1587 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::value, use_UnorderedPointwise_with_hash_tables); Creates 2nd variable use_UnorderedPointwise_with_hash_tables. --- googlemock/include/gmock/gmock-matchers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 41d72529..6dab03a6 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -3033,7 +3033,7 @@ class PointwiseMatcher { operator Matcher() const { GTEST_COMPILE_ASSERT_( !IsHashTable::value, - use_UnorderedPointwise_with_hash_tables); + use_UnorderedPointwise_with_hash_tables_); return MakeMatcher(new Impl(tuple_matcher_, rhs_)); }