diff options
| author | Xiaoyi Zhang <zhangxy@google.com> | 2019-08-23 20:38:46 (GMT) |
|---|---|---|
| committer | Xiaoyi Zhang <zhangxy@google.com> | 2019-08-23 20:38:47 (GMT) |
| commit | 9bf34ace71942f3cd13913e7bafa1cfe1c3962c0 (patch) | |
| tree | 18d77a640edc4376a4c8c26bf3d2d1abdef52aad /googletest/include/gtest/gtest-matchers.h | |
| parent | fb49e6c164490a227bbb7cf5223b846c836a0305 (diff) | |
| parent | 11471da7938bb414a5739e292ccc71f18966068f (diff) | |
| download | googletest-9bf34ace71942f3cd13913e7bafa1cfe1c3962c0.zip googletest-9bf34ace71942f3cd13913e7bafa1cfe1c3962c0.tar.gz googletest-9bf34ace71942f3cd13913e7bafa1cfe1c3962c0.tar.bz2 | |
Merge pull request #2400 from kuzkry:custom-type-traits-enable_if
PiperOrigin-RevId: 264693952
Diffstat (limited to 'googletest/include/gtest/gtest-matchers.h')
| -rw-r--r-- | googletest/include/gtest/gtest-matchers.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googletest/include/gtest/gtest-matchers.h b/googletest/include/gtest/gtest-matchers.h index 0548806..c10d650 100644 --- a/googletest/include/gtest/gtest-matchers.h +++ b/googletest/include/gtest/gtest-matchers.h @@ -300,7 +300,7 @@ class MatcherBase { template <typename U> explicit MatcherBase( const MatcherInterface<U>* impl, - typename internal::EnableIf<!std::is_same<U, const U&>::value>::type* = + typename std::enable_if<!std::is_same<U, const U&>::value>::type* = nullptr) : impl_(new internal::MatcherInterfaceAdapter<U>(impl)) {} @@ -336,7 +336,7 @@ class Matcher : public internal::MatcherBase<T> { template <typename U> explicit Matcher( const MatcherInterface<U>* impl, - typename internal::EnableIf<!std::is_same<U, const U&>::value>::type* = + typename std::enable_if<!std::is_same<U, const U&>::value>::type* = nullptr) : internal::MatcherBase<T>(impl) {} |