generic-library/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
PiperOrigin-RevId: 273585026
This commit is contained in:
Gennadiy Civil 2019-10-10 09:21:38 -04:00
commit cb1d5db1a1
5 changed files with 4 additions and 8 deletions
Show Stats 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"

2
googletest/docs/advanced.md
View File

@ -465,7 +465,7 @@ You can call the function
to assert that types `T1` and `T2` are the same. The function does nothing if to assert that types `T1` and `T2` are the same. The function does nothing if
the assertion is satisfied. If the types are different, the function call will the assertion is satisfied. If the types are different, the function call will
fail to compile, the compiler error message will say that fail to compile, the compiler error message will say that
`type1 and type2 are not the same type` and most likely (depending on the compiler) `T1 and T2 are not the same type` and most likely (depending on the compiler)
show you the actual values of `T1` and `T2`. This is mainly useful inside show you the actual values of `T1` and `T2`. This is mainly useful inside
template code. template code.

3
googletest/include/gtest/gtest.h
View File

@ -2298,8 +2298,7 @@ class GTEST_API_ ScopedTrace {
// to cause a compiler error. // to cause a compiler error.
template <typename T1, typename T2> template <typename T1, typename T2>
constexpr bool StaticAssertTypeEq() noexcept { constexpr bool StaticAssertTypeEq() noexcept {
static_assert(std::is_same<T1, T2>::value, static_assert(std::is_same<T1, T2>::value, "T1 and T2 are not the same type");
"type1 and type2 are not the same type");
return true; return true;
} }