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-param-util.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-param-util.h')
-rw-r--r-- | googletest/include/gtest/internal/gtest-param-util.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/googletest/include/gtest/internal/gtest-param-util.h b/googletest/include/gtest/internal/gtest-param-util.h index 9eb98b1..e155483 100644 --- a/googletest/include/gtest/internal/gtest-param-util.h +++ b/googletest/include/gtest/internal/gtest-param-util.h @@ -154,7 +154,7 @@ class ParamIterator { private: friend class ParamGenerator<T>; explicit ParamIterator(ParamIteratorInterface<T>* impl) : impl_(impl) {} - scoped_ptr<ParamIteratorInterface<T> > impl_; + std::unique_ptr<ParamIteratorInterface<T> > impl_; }; // ParamGeneratorInterface<T> is the binary interface to access generators @@ -354,9 +354,9 @@ class ValuesInIteratorRangeGenerator : public ParamGeneratorInterface<T> { // A cached value of *iterator_. We keep it here to allow access by // pointer in the wrapping iterator's operator->(). // value_ needs to be mutable to be accessed in Current(). - // Use of scoped_ptr helps manage cached value's lifetime, + // Use of std::unique_ptr helps manage cached value's lifetime, // which is bound by the lifespan of the iterator itself. - mutable scoped_ptr<const T> value_; + mutable std::unique_ptr<const T> value_; }; // class ValuesInIteratorRangeGenerator::Iterator // No implementation - assignment is unsupported. @@ -602,7 +602,7 @@ class ParameterizedTestCaseInfo : public ParameterizedTestCaseInfoBase { const std::string test_case_base_name; const std::string test_base_name; - const scoped_ptr<TestMetaFactoryBase<ParamType> > test_meta_factory; + const std::unique_ptr<TestMetaFactoryBase<ParamType> > test_meta_factory; }; using TestInfoContainer = ::std::vector<std::shared_ptr<TestInfo> >; // Records data received from INSTANTIATE_TEST_CASE_P macros: |