diff options
| author | Krystian Kuzniarek <krystian.kuzniarek@gmail.com> | 2019-09-07 04:08:28 (GMT) |
|---|---|---|
| committer | Krystian Kuzniarek <krystian.kuzniarek@gmail.com> | 2019-09-16 17:21:37 (GMT) |
| commit | 7c2bd3af981e9f257a0b61ce664953008c105dad (patch) | |
| tree | f78df1d1d48cbefeedbd4d22fccea82c742d44f7 /googlemock/include | |
| parent | f2fb48c3b3d79a75a88a99fba6576b25d42ec528 (diff) | |
| download | googletest-7c2bd3af981e9f257a0b61ce664953008c105dad.zip googletest-7c2bd3af981e9f257a0b61ce664953008c105dad.tar.gz googletest-7c2bd3af981e9f257a0b61ce664953008c105dad.tar.bz2 | |
square away the stuff that hasn't been merged in a manual review
This fixes up ab8f346b (a manual merge) that has abandoned some things
from PR #2395.
Diffstat (limited to 'googlemock/include')
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 4 | ||||
| -rw-r--r-- | googlemock/include/gmock/internal/gmock-internal-utils.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index bf9eb20..9bff5a7 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)) {} diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h index fdc049c..d012e71 100644 --- a/googlemock/include/gmock/internal/gmock-internal-utils.h +++ b/googlemock/include/gmock/internal/gmock-internal-utils.h @@ -334,8 +334,6 @@ class WithoutMatchers { // Internal use only: access the singleton instance of WithoutMatchers. GTEST_API_ WithoutMatchers GetWithoutMatchers(); -// Type traits. - // Disable MSVC warnings for infinite recursion, since in this case the // the recursion is unreachable. #ifdef _MSC_VER |