diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-10-10 13:21:38 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-10-10 13:21:38 (GMT) |
| commit | cb1d5db1a104c7161fce89483dcfbe0ccb9bb28b (patch) | |
| tree | b58ff93963fe15b329ccdcc141e74dc357ecc5ee /googlemock/include/gmock/gmock-matchers.h | |
| parent | cd17fa2abda2a2e4111cdabd62a87aea16835014 (diff) | |
| parent | 3339b97c6a7fb908cd343ff8251d86782ea264a8 (diff) | |
| download | googletest-cb1d5db1a104c7161fce89483dcfbe0ccb9bb28b.zip googletest-cb1d5db1a104c7161fce89483dcfbe0ccb9bb28b.tar.gz googletest-cb1d5db1a104c7161fce89483dcfbe0ccb9bb28b.tar.bz2 | |
Merge pull request #2448 from kuzkry:bad-googletest-export
PiperOrigin-RevId: 273585026
Diffstat (limited to 'googlemock/include/gmock/gmock-matchers.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 28e188b..4428ec1 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -1607,8 +1607,8 @@ class PointeeMatcher { template <typename Pointer> class Impl : public MatcherInterface<Pointer> { public: - typedef typename PointeeOf<typename std::remove_const< - typename std::remove_reference<Pointer>::type>::type>::type Pointee; + typedef typename PointeeOf<GTEST_REMOVE_REFERENCE_AND_CONST_(Pointer)>::type + Pointee; explicit Impl(const InnerMatcher& matcher) : matcher_(MatcherCast<const Pointee&>(matcher)) {} |