summaryrefslogtreecommitdiffstats
path: root/googlemock/include
diff options
context:
space:
mode:
authormisterg <misterg@google.com>2018-10-30 13:49:22 (GMT)
committerGennadiy Civil <misterg@google.com>2018-10-31 01:20:43 (GMT)
commite857f9cdd998136b9aad634272301f5b2d0476ea (patch)
treefb1ddc72b8448eba93fde494bdf12347ab52bc66 /googlemock/include
parente0d3c37051865bf2ec32de3be0a408a8f2a106ac (diff)
downloadgoogletest-e857f9cdd998136b9aad634272301f5b2d0476ea.zip
googletest-e857f9cdd998136b9aad634272301f5b2d0476ea.tar.gz
googletest-e857f9cdd998136b9aad634272301f5b2d0476ea.tar.bz2
Googletest export
Remove scoped_ptr replace with std::unique_ptr PiperOrigin-RevId: 219291284
Diffstat (limited to 'googlemock/include')
-rw-r--r--googlemock/include/gmock/gmock-spec-builders.h2
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 c0df5cc..e58adfc 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();
}