diff options
| author | misterg <misterg@google.com> | 2018-10-29 15:09:33 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-10-29 17:46:16 (GMT) |
| commit | 80b43d900b8ed44e16b306682d47d73175cecc7f (patch) | |
| tree | 9fcb941d659988961bf0c3150b704bd30a37580f /googlemock/test/gmock-spec-builders_test.cc | |
| parent | 2e308484d9693f8251748c295f6ed7ed25d767eb (diff) | |
| download | googletest-80b43d900b8ed44e16b306682d47d73175cecc7f.zip googletest-80b43d900b8ed44e16b306682d47d73175cecc7f.tar.gz googletest-80b43d900b8ed44e16b306682d47d73175cecc7f.tar.bz2 | |
Googletest export
Remove linked_ptr and use std::shared_ptr instead
PiperOrigin-RevId: 219129336
Diffstat (limited to 'googlemock/test/gmock-spec-builders_test.cc')
| -rw-r--r-- | googlemock/test/gmock-spec-builders_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/googlemock/test/gmock-spec-builders_test.cc b/googlemock/test/gmock-spec-builders_test.cc index 65c9fcc..6502be7 100644 --- a/googlemock/test/gmock-spec-builders_test.cc +++ b/googlemock/test/gmock-spec-builders_test.cc @@ -34,6 +34,7 @@ #include "gmock/gmock-spec-builders.h" +#include <memory> #include <ostream> // NOLINT #include <sstream> #include <string> @@ -99,7 +100,6 @@ using testing::internal::kFail; using testing::internal::kInfoVerbosity; using testing::internal::kWarn; using testing::internal::kWarningVerbosity; -using testing::internal::linked_ptr; #if GTEST_HAS_STREAM_REDIRECTION using testing::HasSubstr; @@ -172,7 +172,7 @@ class ReferenceHoldingMock { public: ReferenceHoldingMock() {} - MOCK_METHOD1(AcceptReference, void(linked_ptr<MockA>*)); + MOCK_METHOD1(AcceptReference, void(std::shared_ptr<MockA>*)); private: GTEST_DISALLOW_COPY_AND_ASSIGN_(ReferenceHoldingMock); @@ -2619,7 +2619,7 @@ TEST(VerifyAndClearTest, DoesNotAffectOtherMockObjects) { TEST(VerifyAndClearTest, DestroyingChainedMocksDoesNotDeadlockThroughExpectations) { - linked_ptr<MockA> a(new MockA); + std::shared_ptr<MockA> a(new MockA); ReferenceHoldingMock test_mock; // EXPECT_CALL stores a reference to a inside test_mock. @@ -2639,7 +2639,7 @@ TEST(VerifyAndClearTest, TEST(VerifyAndClearTest, DestroyingChainedMocksDoesNotDeadlockThroughDefaultAction) { - linked_ptr<MockA> a(new MockA); + std::shared_ptr<MockA> a(new MockA); ReferenceHoldingMock test_mock; // ON_CALL stores a reference to a inside test_mock. |