diff options
| author | Abseil Team <absl-team@google.com> | 2018-10-24 22:04:43 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-10-26 14:19:59 -0400 |
| commit | b57c703963be1ca9749b902c49083beac56648aa (patch) | |
| tree | b7f5433fce3803d121c9963dc69bcdeec4d35f7c /googlemock/src | |
| parent | a50e4f05b3d84c6a014c59a24263328242cc8236 (diff) | |
| download | googletest-b57c703963be1ca9749b902c49083beac56648aa.tar.gz googletest-b57c703963be1ca9749b902c49083beac56648aa.tar.bz2 googletest-b57c703963be1ca9749b902c49083beac56648aa.zip | |
Googletest export
Remove linked_ptr and use std::shared_ptr instead
PiperOrigin-RevId: 218618184
Diffstat (limited to 'googlemock/src')
| -rw-r--r-- | googlemock/src/gmock-spec-builders.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc index c93b2b5d..5c20ed14 100644 --- a/googlemock/src/gmock-spec-builders.cc +++ b/googlemock/src/gmock-spec-builders.cc @@ -38,7 +38,6 @@ #include <stdlib.h> #include <iostream> // NOLINT #include <map> -#include <memory> #include <set> #include <string> #include <vector> @@ -849,7 +848,7 @@ void Mock::ClearDefaultActionsLocked(void* mock_obj) Expectation::Expectation() {} Expectation::Expectation( - const std::shared_ptr<internal::ExpectationBase>& an_expectation_base) + const internal::linked_ptr<internal::ExpectationBase>& an_expectation_base) : expectation_base_(an_expectation_base) {} Expectation::~Expectation() {} |