diff options
| author | Krystian Kuzniarek <krystian.kuzniarek@gmail.com> | 2019-09-16 17:11:20 (GMT) |
|---|---|---|
| committer | Krystian Kuzniarek <krystian.kuzniarek@gmail.com> | 2019-09-16 17:22:10 (GMT) |
| commit | 3339b97c6a7fb908cd343ff8251d86782ea264a8 (patch) | |
| tree | d0e1033db402468d52290e8cf6476a9e9255a9eb /googletest/include | |
| parent | 7c2bd3af981e9f257a0b61ce664953008c105dad (diff) | |
| download | googletest-3339b97c6a7fb908cd343ff8251d86782ea264a8.zip googletest-3339b97c6a7fb908cd343ff8251d86782ea264a8.tar.gz googletest-3339b97c6a7fb908cd343ff8251d86782ea264a8.tar.bz2 | |
square away the stuff that hasn't been merged in a manual reviewrefs/pull/2448/head
This fixes up f2fb48c3 (a manual merge) that has abandoned some things
from PR #2407.
Diffstat (limited to 'googletest/include')
| -rw-r--r-- | googletest/include/gtest/gtest.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h index dbe5b1c..37a1762 100644 --- a/googletest/include/gtest/gtest.h +++ b/googletest/include/gtest/gtest.h @@ -2298,8 +2298,7 @@ class GTEST_API_ ScopedTrace { // to cause a compiler error. template <typename T1, typename T2> constexpr bool StaticAssertTypeEq() noexcept { - static_assert(std::is_same<T1, T2>::value, - "type1 and type2 are not the same type"); + static_assert(std::is_same<T1, T2>::value, "T1 and T2 are not the same type"); return true; } |