livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

meow-7.2.2
Rider Linden 2016-07-12 12:11:01 -07:00
parent a3f63bce3c c0407af8ab
commit 85c0bec92c
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/lleventpoll.cpp
View File

@ -40,12 +40,14 @@
#include "llcorehttputil.h"
#include "lleventfilter.h"
#include "boost/make_shared.hpp"
namespace LLEventPolling
{
namespace Details
{
class LLEventPollImpl
class LLEventPollImpl: public boost::enable_shared_from_this<LLEventPollImpl>
{
public:
LLEventPollImpl(const LLHost &sender);
@ -113,7 +115,7 @@ namespace Details
{
std::string coroname =
LLCoros::instance().launch("LLEventPollImpl::eventPollCoro",
boost::bind(&LLEventPollImpl::eventPollCoro, this, url));
boost::bind(&LLEventPollImpl::eventPollCoro, this->shared_from_this(), url));
LL_INFOS("LLEventPollImpl") << coroname << " with url '" << url << LL_ENDL;
}
}
@ -273,8 +275,7 @@ namespace Details
LLEventPoll::LLEventPoll(const std::string& poll_url, const LLHost& sender):
mImpl()
{
mImpl = boost::unique_ptr<LLEventPolling::Details::LLEventPollImpl>
(new LLEventPolling::Details::LLEventPollImpl(sender));
mImpl = boost::make_shared<LLEventPolling::Details::LLEventPollImpl>(sender);
mImpl->start(poll_url);
}

8
indra/newview/lleventpoll.h
View File

@ -27,12 +27,6 @@
#ifndef LL_LLEVENTPOLL_H
#define LL_LLEVENTPOLL_H
#include "boost/move/unique_ptr.hpp"
namespace boost
{
using ::boost::movelib::unique_ptr; // move unique_ptr into the boost namespace.
}
class LLHost;
@ -57,7 +51,7 @@ public:
private:
boost::unique_ptr<LLEventPolling::Details::LLEventPollImpl> mImpl;
boost::shared_ptr<LLEventPolling::Details::LLEventPollImpl> mImpl;
};