eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

square away the stuff that hasn't been merged in a manual review

Browse Source 
This fixes up f2fb48c3 (a manual merge) that has abandoned some things
from PR #2407.
This commit is contained in:
Krystian Kuzniarek 2019-09-16 19:11:20 +02:00
parent 7c2bd3af98
commit 3339b97c6a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
googletest/docs/advanced.md
View File

@ -465,7 +465,7 @@ You can call the function
to assert that types `T1` and `T2` are the same. The function does nothing if to assert that types `T1` and `T2` are the same. The function does nothing if
the assertion is satisfied. If the types are different, the function call will the assertion is satisfied. If the types are different, the function call will
fail to compile, the compiler error message will say that fail to compile, the compiler error message will say that
`type1 and type2 are not the same type` and most likely (depending on the compiler) `T1 and T2 are not the same type` and most likely (depending on the compiler)
show you the actual values of `T1` and `T2`. This is mainly useful inside show you the actual values of `T1` and `T2`. This is mainly useful inside
template code. template code.

3
googletest/include/gtest/gtest.h
View File

@ -2298,8 +2298,7 @@ class GTEST_API_ ScopedTrace {
// to cause a compiler error. // to cause a compiler error.
template <typename T1, typename T2> template <typename T1, typename T2>
constexpr bool StaticAssertTypeEq() noexcept { constexpr bool StaticAssertTypeEq() noexcept {
static_assert(std::is_same<T1, T2>::value, static_assert(std::is_same<T1, T2>::value, "T1 and T2 are not the same type");
"type1 and type2 are not the same type");
return true; return true;
} }