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