diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-24 19:48:25 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-24 19:48:25 +0300 |
| commit | 1bcc4e7f709bf7067121b5891f3f7db3b99235a0 (patch) | |
| tree | bc9cea56b8e236f52df392084552018c387cff2c /indra/llcorehttp/httprequest.h | |
| parent | 09454c53a48e88a9cdd54f68ac507694a766b213 (diff) | |
| parent | 428f21cf795f440f69a772b314f877ea0c6d4741 (diff) | |
Merge pull request #1313 from secondlife/marchcat/x-merge
Release (Maint YZ) -> Maint X merge
Diffstat (limited to 'indra/llcorehttp/httprequest.h')
| -rw-r--r-- | indra/llcorehttp/httprequest.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcorehttp/httprequest.h b/indra/llcorehttp/httprequest.h index ca4b9e92bc..857a034a7b 100644 --- a/indra/llcorehttp/httprequest.h +++ b/indra/llcorehttp/httprequest.h @@ -96,8 +96,8 @@ private: public: typedef unsigned int policy_t; - typedef boost::shared_ptr<HttpRequest> ptr_t; - typedef boost::weak_ptr<HttpRequest> wptr_t; + typedef std::shared_ptr<HttpRequest> ptr_t; + typedef std::weak_ptr<HttpRequest> wptr_t; public: /// @name PolicyMethods /// @{ @@ -627,7 +627,7 @@ public: protected: private: - typedef boost::shared_ptr<HttpReplyQueue> HttpReplyQueuePtr_t; + typedef std::shared_ptr<HttpReplyQueue> HttpReplyQueuePtr_t; /// @name InstanceData /// |