diff options
| author | Jerry Turcios <jerryturcios08@gmail.com> | 2018-10-31 10:16:27 -0400 |
|---|---|---|
| committer | Jerry Turcios <jerryturcios08@gmail.com> | 2018-10-31 10:16:27 -0400 |
| commit | d1beec4023b581e9454cbafd2a0c3ca235dde95b (patch) | |
| tree | f8836c071a40dcc65188dc5aca034fbc97bf643f /googlemock/include | |
| parent | 3896e3b593c332087564a767b3d8f2e7c8dbbd25 (diff) | |
| parent | 71d4fc8d76ebd539440aff5cfc873be9b50f202b (diff) | |
| download | googletest-d1beec4023b581e9454cbafd2a0c3ca235dde95b.tar.gz googletest-d1beec4023b581e9454cbafd2a0c3ca235dde95b.tar.bz2 googletest-d1beec4023b581e9454cbafd2a0c3ca235dde95b.zip | |
Merge branch 'master' of https://github.com/google/googletest
Diffstat (limited to 'googlemock/include')
| -rw-r--r-- | googlemock/include/gmock/gmock-spec-builders.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/include/gmock/gmock-spec-builders.h b/googlemock/include/gmock/gmock-spec-builders.h index c0df5ccb..e58adfcb 100644 --- a/googlemock/include/gmock/gmock-spec-builders.h +++ b/googlemock/include/gmock/gmock-spec-builders.h @@ -1598,7 +1598,7 @@ class FunctionMockerBase : public UntypedFunctionMockerBase { // const_cast is required since in C++98 we still pass ArgumentTuple around // by const& instead of rvalue reference. void* untyped_args = const_cast<void*>(static_cast<const void*>(&args)); - scoped_ptr<ResultHolder> holder( + std::unique_ptr<ResultHolder> holder( DownCast_<ResultHolder*>(this->UntypedInvokeWith(untyped_args))); return holder->Unwrap(); } |