diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-04-24 16:35:00 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-04-24 16:35:00 -0400 |
| commit | 6d860672ec3e05660844a40c56b8644130a1f6b6 (patch) | |
| tree | 2cf0f229f5f8c0e019255e2265f6bfb67af1c93c /indra/llmessage/lliosocket.h | |
| parent | 40a881dd26cbf0b92e03ec20e296b94e89bdb2c3 (diff) | |
| parent | d98fc504a1d4bc292ba86acdda053c8b4598a193 (diff) | |
Merge 'main' into release/luau-scripting on promotion of Maint YZ
Diffstat (limited to 'indra/llmessage/lliosocket.h')
| -rw-r--r-- | indra/llmessage/lliosocket.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/lliosocket.h b/indra/llmessage/lliosocket.h index 303d80eb14..a62b3c0204 100644 --- a/indra/llmessage/lliosocket.h +++ b/indra/llmessage/lliosocket.h @@ -65,7 +65,7 @@ public: /** * @brief Reference counted shared pointers to sockets. */ - typedef boost::shared_ptr<LLSocket> ptr_t; + typedef std::shared_ptr<LLSocket> ptr_t; /** * @brief Type of socket to create. @@ -305,7 +305,7 @@ class LLIOServerSocket : public LLIOPipe { public: typedef LLSocket::ptr_t socket_t; - typedef boost::shared_ptr<LLChainIOFactory> factory_t; + typedef std::shared_ptr<LLChainIOFactory> factory_t; LLIOServerSocket(apr_pool_t* pool, socket_t listener, factory_t reactor); virtual ~LLIOServerSocket(); |