diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-08-15 17:34:18 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-08-15 17:34:18 -0400 |
| commit | 9b70406919faddd764cb73b9d0ebb118c0a386ea (patch) | |
| tree | eaa9cd450a7729b5c867221dbff8fdc1243f7e1b /googlemock/include/gmock | |
| parent | 6aba4a5c45c03c2367c3390708c049fa8bc14487 (diff) | |
| parent | ec49fbca4cb84651fb2eae5d093d0342f356cf29 (diff) | |
| download | googletest-9b70406919faddd764cb73b9d0ebb118c0a386ea.tar.gz googletest-9b70406919faddd764cb73b9d0ebb118c0a386ea.tar.bz2 googletest-9b70406919faddd764cb73b9d0ebb118c0a386ea.zip | |
Merge pull request #2399 from kuzkry:custom-type-traits-is_same
PiperOrigin-RevId: 263568712
Diffstat (limited to 'googlemock/include/gmock')
| -rw-r--r-- | googlemock/include/gmock/gmock-spec-builders.h | 6 | ||||
| -rw-r--r-- | googlemock/include/gmock/internal/gmock-internal-utils.h | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/googlemock/include/gmock/gmock-spec-builders.h b/googlemock/include/gmock/gmock-spec-builders.h index 735a3bcb..0d1adda5 100644 --- a/googlemock/include/gmock/gmock-spec-builders.h +++ b/googlemock/include/gmock/gmock-spec-builders.h @@ -67,6 +67,7 @@ #include <set> #include <sstream> #include <string> +#include <type_traits> #include <utility> #include <vector> #include "gmock/gmock-actions.h" @@ -1653,9 +1654,8 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase { const OnCallSpec<F>* const spec = FindOnCallSpec(args); if (spec == nullptr) { - *os << (internal::type_equals<Result, void>::value ? - "returning directly.\n" : - "returning default value.\n"); + *os << (std::is_void<Result>::value ? "returning directly.\n" + : "returning default value.\n"); } else { *os << "taking default action specified at:\n" << FormatFileLocation(spec->file(), spec->line()) << "\n"; diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h index ee004790..7bfa54c0 100644 --- a/googlemock/include/gmock/internal/gmock-internal-utils.h +++ b/googlemock/include/gmock/internal/gmock-internal-utils.h @@ -359,10 +359,6 @@ GTEST_API_ WithoutMatchers GetWithoutMatchers(); template <typename T> struct is_reference : public false_type {}; template <typename T> struct is_reference<T&> : public true_type {}; -// type_equals<T1, T2>::value is non-zero if T1 and T2 are the same type. -template <typename T1, typename T2> struct type_equals : public false_type {}; -template <typename T> struct type_equals<T, T> : public true_type {}; - // remove_reference<T>::type removes the reference from type T, if any. template <typename T> struct remove_reference { typedef T type; }; // NOLINT template <typename T> struct remove_reference<T&> { typedef T type; }; // NOLINT |