summaryrefslogtreecommitdiffstats
path: root/googletest/test/gtest_stress_test.cc
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 /googletest/test/gtest_stress_test.cc
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 'googletest/test/gtest_stress_test.cc')
-rw-r--r--googletest/test/gtest_stress_test.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/googletest/test/gtest_stress_test.cc b/googletest/test/gtest_stress_test.cc
index 3af1403..8434819 100644
--- a/googletest/test/gtest_stress_test.cc
+++ b/googletest/test/gtest_stress_test.cc
@@ -45,7 +45,6 @@ namespace {
using internal::Notification;
using internal::TestPropertyKeyIs;
using internal::ThreadWithParam;
-using internal::scoped_ptr;
// In order to run tests in this file, for platforms where Google Test is
// thread safe, implement ThreadWithParam. See the description of its API
@@ -119,7 +118,7 @@ void CheckTestFailureCount(int expected_failures) {
// concurrently.
TEST(StressTest, CanUseScopedTraceAndAssertionsInManyThreads) {
{
- scoped_ptr<ThreadWithParam<int> > threads[kThreadCount];
+ std::unique_ptr<ThreadWithParam<int> > threads[kThreadCount];
Notification threads_can_start;
for (int i = 0; i != kThreadCount; i++)
threads[i].reset(new ThreadWithParam<int>(&ManyAsserts,