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/include/gmock/gmock-generated-actions.h | |
| 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/include/gmock/gmock-generated-actions.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-generated-actions.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/googlemock/include/gmock/gmock-generated-actions.h b/googlemock/include/gmock/gmock-generated-actions.h index 0845b22..8966f05 100644 --- a/googlemock/include/gmock/gmock-generated-actions.h +++ b/googlemock/include/gmock/gmock-generated-actions.h @@ -41,6 +41,7 @@ #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_ #define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_ +#include <memory> #include <utility> #include "gmock/gmock-actions.h" @@ -348,7 +349,7 @@ class InvokeCallbackAction { callback_.get(), args); } private: - const linked_ptr<CallbackType> callback_; + const std::shared_ptr<CallbackType> callback_; }; // An INTERNAL macro for extracting the type of a tuple field. It's |