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/test/googletest-port-test.cc | |
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/test/googletest-port-test.cc')
-rw-r--r-- | googletest/test/googletest-port-test.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/googletest/test/googletest-port-test.cc b/googletest/test/googletest-port-test.cc index 2de35e0..e6a227b 100644 --- a/googletest/test/googletest-port-test.cc +++ b/googletest/test/googletest-port-test.cc @@ -37,6 +37,7 @@ #endif // GTEST_OS_MAC #include <list> +#include <memory> #include <utility> // For std::pair and std::make_pair. #include <vector> @@ -218,14 +219,6 @@ TEST(IteratorTraitsTest, WorksForPointerToConst) { IteratorTraits<const void* const*>::value_type>(); } -// Tests that the element_type typedef is available in scoped_ptr and refers -// to the parameter type. -TEST(ScopedPtrTest, DefinesElementType) { - StaticAssertTypeEq<int, ::testing::internal::scoped_ptr<int>::element_type>(); -} - -// FIXME: Implement THE REST of scoped_ptr tests. - TEST(GtestCheckSyntaxTest, BehavesLikeASingleStatement) { if (AlwaysFalse()) GTEST_CHECK_(false) << "This should never be executed; " @@ -1095,7 +1088,7 @@ TEST(MutexTest, OnlyOneThreadCanLockAtATime) { typedef ThreadWithParam<pair<AtomicCounterWithMutex*, int> > ThreadType; const int kCycleCount = 20; const int kThreadCount = 7; - scoped_ptr<ThreadType> counting_threads[kThreadCount]; + std::unique_ptr<ThreadType> counting_threads[kThreadCount]; Notification threads_can_start; // Creates and runs kThreadCount threads that increment locked_counter // kCycleCount times each. |