Googletest export
Merge 4c9ef099b29d2c840c04643cd9662fd7be712f7b into 565f1b8482
Closes #2403
COPYBARA_INTEGRATE_REVIEW=https://github.com/google/googletest/pull/2403 from IYP-Programer-Yeah:remove-compile-assert-type-equal 4c9ef099b29d2c840c04643cd9662fd7be712f7b
PiperOrigin-RevId: 268681883
This commit is contained in:
committed by
Shaindel Schwartz
parent
274afe50cf
commit
ac24edd6e0
@@ -619,7 +619,7 @@ class ReturnVoidAction {
|
||||
// Allows Return() to be used in any void-returning function.
|
||||
template <typename Result, typename ArgumentTuple>
|
||||
static void Perform(const ArgumentTuple&) {
|
||||
CompileAssertTypesEqual<void, Result>();
|
||||
static_assert(std::is_void<Result>::value, "Result should be void.");
|
||||
}
|
||||
};
|
||||
|
||||
@@ -842,7 +842,7 @@ class IgnoreResultAction {
|
||||
typedef typename internal::Function<F>::Result Result;
|
||||
|
||||
// Asserts at compile time that F returns void.
|
||||
CompileAssertTypesEqual<void, Result>();
|
||||
static_assert(std::is_void<Result>::value, "Result type should be void.");
|
||||
|
||||
return Action<F>(new Impl<F>(action_));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user