Merge pull request #2448 from kuzkry:bad-googletest-export

PiperOrigin-RevId: 273585026
2019-10-10 09:21:38 -04:00
parent cd17fa2abd 3339b97c6a
commit cb1d5db1a1
5 changed files with 4 additions and 8 deletions
--- 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)) {}