diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-08-15 21:34:18 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-08-15 21:34:18 (GMT) |
| commit | 9b70406919faddd764cb73b9d0ebb118c0a386ea (patch) | |
| tree | eaa9cd450a7729b5c867221dbff8fdc1243f7e1b /googletest/include/gtest/internal/gtest-internal.h | |
| parent | 6aba4a5c45c03c2367c3390708c049fa8bc14487 (diff) | |
| parent | ec49fbca4cb84651fb2eae5d093d0342f356cf29 (diff) | |
| download | googletest-9b70406919faddd764cb73b9d0ebb118c0a386ea.zip googletest-9b70406919faddd764cb73b9d0ebb118c0a386ea.tar.gz googletest-9b70406919faddd764cb73b9d0ebb118c0a386ea.tar.bz2 | |
Merge pull request #2399 from kuzkry:custom-type-traits-is_same
PiperOrigin-RevId: 263568712
Diffstat (limited to 'googletest/include/gtest/internal/gtest-internal.h')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-internal.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/googletest/include/gtest/internal/gtest-internal.h b/googletest/include/gtest/internal/gtest-internal.h index 08531d8..240d791 100644 --- a/googletest/include/gtest/internal/gtest-internal.h +++ b/googletest/include/gtest/internal/gtest-internal.h @@ -977,9 +977,9 @@ template <typename C> struct IsRecursiveContainerImpl<C, true> { using value_type = decltype(*std::declval<typename C::const_iterator>()); using type = - is_same<typename std::remove_const< - typename std::remove_reference<value_type>::type>::type, - C>; + std::is_same<typename std::remove_const< + typename std::remove_reference<value_type>::type>::type, + C>; }; // IsRecursiveContainer<Type> is a unary compile-time predicate that |