diff options
| author | misterg <misterg@google.com> | 2018-10-30 13:49:22 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-10-31 01:20:43 (GMT) |
| commit | e857f9cdd998136b9aad634272301f5b2d0476ea (patch) | |
| tree | fb1ddc72b8448eba93fde494bdf12347ab52bc66 /googletest/include/gtest/internal/gtest-death-test-internal.h | |
| parent | e0d3c37051865bf2ec32de3be0a408a8f2a106ac (diff) | |
| download | googletest-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/include/gtest/internal/gtest-death-test-internal.h')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-death-test-internal.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/googletest/include/gtest/internal/gtest-death-test-internal.h b/googletest/include/gtest/internal/gtest-death-test-internal.h index f06cef2..c9d5908 100644 --- a/googletest/include/gtest/internal/gtest-death-test-internal.h +++ b/googletest/include/gtest/internal/gtest-death-test-internal.h @@ -39,6 +39,7 @@ #include "gtest/internal/gtest-internal.h" #include <stdio.h> +#include <memory> namespace testing { namespace internal { @@ -196,7 +197,7 @@ GTEST_API_ bool ExitedUnsuccessfully(int exit_status); goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__); \ } \ if (gtest_dt != nullptr) { \ - ::testing::internal::scoped_ptr< ::testing::internal::DeathTest> \ + std::unique_ptr< ::testing::internal::DeathTest> \ gtest_dt_ptr(gtest_dt); \ switch (gtest_dt->AssumeRole()) { \ case ::testing::internal::DeathTest::OVERSEE_TEST: \ |