diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-24 19:48:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-24 19:48:36 +0300 |
| commit | 3c833ce035c87e0f03ec8e46894d10adb33ad820 (patch) | |
| tree | f2ee6c215244bdea45440b1a753c83d19eace121 /indra/llcorehttp/_httpoperation.cpp | |
| parent | ea4ddb5f40ee8dd253be0ac4229de90f1eef61a3 (diff) | |
| parent | 3713c33098ab98d840c0ed20bcbb5a1cb8e15235 (diff) | |
Merge pull request #1314 from secondlife/marchcat/b-merge
Release (Maint YZ) -> Maint B merge
Diffstat (limited to 'indra/llcorehttp/_httpoperation.cpp')
| -rw-r--r-- | indra/llcorehttp/_httpoperation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcorehttp/_httpoperation.cpp b/indra/llcorehttp/_httpoperation.cpp index 3b64018132..c3a9bcaf54 100644 --- a/indra/llcorehttp/_httpoperation.cpp +++ b/indra/llcorehttp/_httpoperation.cpp @@ -58,7 +58,7 @@ HttpOperation::handleMap_t HttpOperation::mHandleMap; LLCoreInt::HttpMutex HttpOperation::mOpMutex; HttpOperation::HttpOperation(): - boost::enable_shared_from_this<HttpOperation>(), + std::enable_shared_from_this<HttpOperation>(), mReplyQueue(), mUserHandler(), mReqPolicy(HttpRequest::DEFAULT_POLICY_ID), |