Make ReturnNull() support unique_ptr and shared_ptr.

This commit is contained in:
kosak
2015-01-08 03:03:09 +00:00
parent 8e838ce0fd
commit 53d49dc43e
2 changed files with 19 additions and 1 deletions

View File

@@ -583,12 +583,18 @@ class ReturnAction {
// Implements the ReturnNull() action.
class ReturnNullAction {
public:
// Allows ReturnNull() to be used in any pointer-returning function.
// Allows ReturnNull() to be used in any pointer-returning function. In C++11
// this is enforced by returning nullptr, and in non-C++11 by asserting a
// pointer type on compile time.
template <typename Result, typename ArgumentTuple>
static Result Perform(const ArgumentTuple&) {
#if GTEST_LANG_CXX11
return nullptr;
#else
GTEST_COMPILE_ASSERT_(internal::is_pointer<Result>::value,
ReturnNull_can_be_used_to_return_a_pointer_only);
return NULL;
#endif // GTEST_LANG_CXX11
}
};