diff options
| author | Jerry Turcios <jerryturcios08@gmail.com> | 2018-10-29 21:09:25 -0400 |
|---|---|---|
| committer | Jerry Turcios <jerryturcios08@gmail.com> | 2018-10-29 21:09:25 -0400 |
| commit | 3896e3b593c332087564a767b3d8f2e7c8dbbd25 (patch) | |
| tree | 1bac50c1afdb97db255a4fbef0b33941c8025f12 /googlemock/test/gmock-spec-builders_test.cc | |
| parent | b8a03c80ad59a4735f852ab13725f2d14ead424f (diff) | |
| parent | b9347b31c338851879d0105f0fe32d09007f0433 (diff) | |
| download | googletest-3896e3b593c332087564a767b3d8f2e7c8dbbd25.tar.gz googletest-3896e3b593c332087564a767b3d8f2e7c8dbbd25.tar.bz2 googletest-3896e3b593c332087564a767b3d8f2e7c8dbbd25.zip | |
Merge branch 'master' of https://github.com/google/googletest
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 65c9fcc4..6502be74 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. |