gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

square away the stuff that hasn't been merged in a manual review

Browse Source 
This fixes up ab8f346b (a manual merge) that has abandoned some things
from PR #2395.
This commit is contained in:
Krystian Kuzniarek
2019-09-07 06:08:28 +02:00
parent f2fb48c3b3
commit 7c2bd3af98
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
googlemock/include/gmock/gmock-matchers.h
View File

@@ -1607,8 +1607,8 @@ class PointeeMatcher {
template <typename Pointer> template <typename Pointer>
class Impl : public MatcherInterface<Pointer> { class Impl : public MatcherInterface<Pointer> {
public: public:
typedef typename PointeeOf<typename std::remove_const< typedef typename PointeeOf<GTEST_REMOVE_REFERENCE_AND_CONST_(Pointer)>::type
typename std::remove_reference<Pointer>::type>::type>::type Pointee; Pointee;
explicit Impl(const InnerMatcher& matcher) explicit Impl(const InnerMatcher& matcher)
: matcher_(MatcherCast<const Pointee&>(matcher)) {} : matcher_(MatcherCast<const Pointee&>(matcher)) {}

2
googlemock/include/gmock/internal/gmock-internal-utils.h
View File

@@ -334,8 +334,6 @@ class WithoutMatchers {
// Internal use only: access the singleton instance of WithoutMatchers. // Internal use only: access the singleton instance of WithoutMatchers.
GTEST_API_ WithoutMatchers GetWithoutMatchers(); GTEST_API_ WithoutMatchers GetWithoutMatchers();
// Type traits.
// Disable MSVC warnings for infinite recursion, since in this case the // Disable MSVC warnings for infinite recursion, since in this case the
// the recursion is unreachable. // the recursion is unreachable.
#ifdef _MSC_VER #ifdef _MSC_VER

1
googlemock/test/gmock-internal-utils_test.cc
View File

@@ -40,7 +40,6 @@
#include <memory> #include <memory>
#include <sstream> #include <sstream>
#include <string> #include <string>
#include <type_traits>
#include <vector> #include <vector>
#include "gmock/gmock.h" #include "gmock/gmock.h"