gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Googletest export

Browse Source 
Remove scoped_ptr replace with std::unique_ptr

PiperOrigin-RevId: 219291284
This commit is contained in:
misterg
2018-10-30 09:49:22 -04:00
committed by Gennadiy Civil
parent e0d3c37051
commit e857f9cdd9
13 changed files with 30 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
googlemock/include/gmock/gmock-spec-builders.h
View File

@@ -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();
}

2
googlemock/test/gmock-matchers_test.cc
View File

@@ -145,10 +145,8 @@ using testing::internal::FormatMatcherDescription;
using testing::internal::IsReadableTypeName;
using testing::internal::MatchMatrix;
using testing::internal::RE;
using testing::internal::scoped_ptr;
using testing::internal::StreamMatchResultListener;
using testing::internal::Strings;
using testing::internal::scoped_ptr;
using testing::internal::string;
// For testing ExplainMatchResultTo().