diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-11-16 18:16:24 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-11-16 18:16:24 +0000 |
| commit | b1964a47005d7bbd99258af7f4eaf4b12baeb423 (patch) | |
| tree | 8e27a7cb161f6e24439a772c5bcfdd4a3ee6f83a /indra/newview/lleventpoll.cpp | |
| parent | e914f3e4a11ff86b3e05089c9b3a6677ec623c9c (diff) | |
| parent | 17f71efce08ed4e677b497f4734d6f9f1fef56a3 (diff) | |
Merged in DV528-merge-6.5.1 (pull request #774)
DRTVWR-528 merge up to 6.5.1
Diffstat (limited to 'indra/newview/lleventpoll.cpp')
| -rw-r--r-- | indra/newview/lleventpoll.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lleventpoll.cpp b/indra/newview/lleventpoll.cpp index 4b5fd8a758..6f3f6e9166 100644 --- a/indra/newview/lleventpoll.cpp +++ b/indra/newview/lleventpoll.cpp @@ -47,7 +47,7 @@ namespace LLEventPolling namespace Details { - class LLEventPollImpl: public boost::enable_shared_from_this<LLEventPollImpl> + class LLEventPollImpl: public std::enable_shared_from_this<LLEventPollImpl> { public: LLEventPollImpl(const LLHost &sender); @@ -284,7 +284,7 @@ namespace Details LLEventPoll::LLEventPoll(const std::string& poll_url, const LLHost& sender): mImpl() { - mImpl = boost::make_shared<LLEventPolling::Details::LLEventPollImpl>(sender); + mImpl = std::make_shared<LLEventPolling::Details::LLEventPollImpl>(sender); mImpl->start(poll_url); } |