diff options
| author | Krystian Kuzniarek <krystian.kuzniarek@gmail.com> | 2019-08-13 20:30:12 (GMT) |
|---|---|---|
| committer | Krystian Kuzniarek <krystian.kuzniarek@gmail.com> | 2019-08-14 12:00:44 (GMT) |
| commit | ec49fbca4cb84651fb2eae5d093d0342f356cf29 (patch) | |
| tree | 24bdf499c55ba728098614c143232c8f5d863be0 /googletest/include/gtest/gtest-matchers.h | |
| parent | 90a443f9c2437ca8a682a1ac625eba64e1d74a8a (diff) | |
| download | googletest-ec49fbca4cb84651fb2eae5d093d0342f356cf29.zip googletest-ec49fbca4cb84651fb2eae5d093d0342f356cf29.tar.gz googletest-ec49fbca4cb84651fb2eae5d093d0342f356cf29.tar.bz2 | |
remove custom implementations of std::is_samerefs/pull/2399/head
Diffstat (limited to 'googletest/include/gtest/gtest-matchers.h')
| -rw-r--r-- | googletest/include/gtest/gtest-matchers.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/googletest/include/gtest/gtest-matchers.h b/googletest/include/gtest/gtest-matchers.h index 7711178..0548806 100644 --- a/googletest/include/gtest/gtest-matchers.h +++ b/googletest/include/gtest/gtest-matchers.h @@ -42,6 +42,7 @@ #include <memory> #include <ostream> #include <string> +#include <type_traits> #include "gtest/gtest-printers.h" #include "gtest/internal/gtest-internal.h" @@ -299,8 +300,8 @@ class MatcherBase { template <typename U> explicit MatcherBase( const MatcherInterface<U>* impl, - typename internal::EnableIf< - !internal::IsSame<U, const U&>::value>::type* = nullptr) + typename internal::EnableIf<!std::is_same<U, const U&>::value>::type* = + nullptr) : impl_(new internal::MatcherInterfaceAdapter<U>(impl)) {} MatcherBase(const MatcherBase&) = default; @@ -333,9 +334,10 @@ class Matcher : public internal::MatcherBase<T> { : internal::MatcherBase<T>(impl) {} template <typename U> - explicit Matcher(const MatcherInterface<U>* impl, - typename internal::EnableIf< - !internal::IsSame<U, const U&>::value>::type* = nullptr) + explicit Matcher( + const MatcherInterface<U>* impl, + typename internal::EnableIf<!std::is_same<U, const U&>::value>::type* = + nullptr) : internal::MatcherBase<T>(impl) {} // Implicit constructor here allows people to write |