From e857f9cdd998136b9aad634272301f5b2d0476ea Mon Sep 17 00:00:00 2001
From: misterg <misterg@google.com>
Date: Tue, 30 Oct 2018 09:49:22 -0400
Subject: Googletest export

Remove scoped_ptr replace with std::unique_ptr

PiperOrigin-RevId: 219291284
---
 googlemock/include/gmock/gmock-spec-builders.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'googlemock/include')

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();
   }
-- 
cgit v1.2.3