diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-10-10 09:21:38 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-10-10 09:21:38 -0400 |
| commit | cb1d5db1a104c7161fce89483dcfbe0ccb9bb28b (patch) | |
| tree | b58ff93963fe15b329ccdcc141e74dc357ecc5ee /googlemock | |
| parent | cd17fa2abda2a2e4111cdabd62a87aea16835014 (diff) | |
| parent | 3339b97c6a7fb908cd343ff8251d86782ea264a8 (diff) | |
| download | googletest-cb1d5db1a104c7161fce89483dcfbe0ccb9bb28b.tar.gz googletest-cb1d5db1a104c7161fce89483dcfbe0ccb9bb28b.tar.bz2 googletest-cb1d5db1a104c7161fce89483dcfbe0ccb9bb28b.zip | |
Merge pull request #2448 from kuzkry:bad-googletest-export
PiperOrigin-RevId: 273585026
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 4 | ||||
| -rw-r--r-- | googlemock/include/gmock/internal/gmock-internal-utils.h | 2 | ||||
| -rw-r--r-- | googlemock/test/gmock-internal-utils_test.cc | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 28e188bb..4428ec14 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 fdc049c5..d012e710 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 diff --git a/googlemock/test/gmock-internal-utils_test.cc b/googlemock/test/gmock-internal-utils_test.cc index d000e692..19ba6fe5 100644 --- a/googlemock/test/gmock-internal-utils_test.cc +++ b/googlemock/test/gmock-internal-utils_test.cc @@ -40,7 +40,6 @@ #include <memory> #include <sstream> #include <string> -#include <type_traits> #include <vector> #include "gmock/gmock.h" |