diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-04-24 09:43:04 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-04-24 09:43:04 -0400 |
commit | fc71a9c1ed96cb1cb97124e3cceabdfa11e1cc75 (patch) | |
tree | b8e19975b3acc800aeaf8c541a780dbb84dc1fd3 /indra/llplugin/llpluginprocessparent.h | |
parent | a3cbd41543258818589dd0e368c68d2dc62b3398 (diff) | |
parent | 5e40b5e64433b224be4dc220e4496dcd0a43f3f6 (diff) |
Merge release/maint-yz to main on promotion of secondlife/viewer #736: Maintenance YZ 7.1.6.8745209917
Diffstat (limited to 'indra/llplugin/llpluginprocessparent.h')
-rw-r--r-- | indra/llplugin/llpluginprocessparent.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llplugin/llpluginprocessparent.h b/indra/llplugin/llpluginprocessparent.h index 1893c9e657..01627925d7 100644 --- a/indra/llplugin/llpluginprocessparent.h +++ b/indra/llplugin/llpluginprocessparent.h @@ -43,7 +43,7 @@ #include "llsd.h" #include "llevents.h" -class LLPluginProcessParentOwner : public boost::enable_shared_from_this < LLPluginProcessParentOwner > +class LLPluginProcessParentOwner : public std::enable_shared_from_this < LLPluginProcessParentOwner > { public: virtual ~LLPluginProcessParentOwner(); @@ -60,7 +60,7 @@ class LLPluginProcessParent : public LLPluginMessagePipeOwner LLPluginProcessParent(LLPluginProcessParentOwner *owner); public: - typedef boost::shared_ptr<LLPluginProcessParent> ptr_t; + typedef std::shared_ptr<LLPluginProcessParent> ptr_t; ~LLPluginProcessParent(); |