diff options
author | Abseil Team <absl-team@google.com> | 2020-01-31 12:03:06 -0500 |
---|---|---|
committer | Andy Getz <durandal@google.com> | 2020-02-07 13:34:42 -0500 |
commit | 572e261b607585d7044ad3321f9530d5c14a2564 (patch) | |
tree | 71908c4d9b8481ea9f6e6289e90b69aff820e2aa /googlemock/include/gmock/gmock-generated-matchers.h.pump | |
parent | 7bc671b8e0de264e58bb479535dc66f3be70ee4f (diff) | |
download | googletest-572e261b607585d7044ad3321f9530d5c14a2564.tar.gz googletest-572e261b607585d7044ad3321f9530d5c14a2564.tar.bz2 googletest-572e261b607585d7044ad3321f9530d5c14a2564.zip |
Googletest export
Fix use of reserved names.
Minimize code duplication needed for explict-vs-nonexplicit constructor.
PiperOrigin-RevId: 292555014
Diffstat (limited to 'googlemock/include/gmock/gmock-generated-matchers.h.pump')
-rw-r--r-- | googlemock/include/gmock/gmock-generated-matchers.h.pump | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/googlemock/include/gmock/gmock-generated-matchers.h.pump b/googlemock/include/gmock/gmock-generated-matchers.h.pump index fc0ffdcf..0ea3aad9 100644 --- a/googlemock/include/gmock/gmock-generated-matchers.h.pump +++ b/googlemock/include/gmock/gmock-generated-matchers.h.pump @@ -80,9 +80,8 @@ $var param_field_decls2 = [[$for j #define $macro_name(name, description$for j [[, p$j]])\$template class $class_name : public ::testing::internal::MatcherBaseImpl<$class_name$param_types> {\ - using __internal_base_type = ::testing::internal::MatcherBaseImpl<$class_name>;\ public:\ - using __internal_base_type::__internal_base_type;\ + using $class_name::MatcherBaseImpl::MatcherBaseImpl;\ template <typename arg_type>\ class gmock_Impl : public ::testing::MatcherInterface<\ GTEST_REFERENCE_TO_CONST_(arg_type)> {\ |