diff options
author | Rider Linden <rider@lindenlab.com> | 2016-07-12 11:07:05 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2016-07-12 11:07:05 -0700 |
commit | c0407af8ab181662f6049ae2cf4ca1fd562debe4 (patch) | |
tree | d561ba929c2f586570a9a7b5598ecbcdea7e090c /indra | |
parent | c1c9b3d74e17d8e5793c9b87e211a30d71245e93 (diff) |
STORM-2132: Remove obsoleted unique_ptr.hpp, use make_shared for pointer allocation.
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/lleventpoll.cpp | 4 | ||||
-rw-r--r-- | indra/newview/lleventpoll.h | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/indra/newview/lleventpoll.cpp b/indra/newview/lleventpoll.cpp index 51967d54a0..cc77b407ae 100644 --- a/indra/newview/lleventpoll.cpp +++ b/indra/newview/lleventpoll.cpp @@ -40,6 +40,8 @@ #include "llcorehttputil.h" #include "lleventfilter.h" +#include "boost/make_shared.hpp" + namespace LLEventPolling { namespace Details @@ -273,7 +275,7 @@ namespace Details LLEventPoll::LLEventPoll(const std::string& poll_url, const LLHost& sender): mImpl() { - mImpl = boost::shared_ptr<LLEventPolling::Details::LLEventPollImpl>(new LLEventPolling::Details::LLEventPollImpl(sender)); + mImpl = boost::make_shared<LLEventPolling::Details::LLEventPollImpl>(sender); mImpl->start(poll_url); } diff --git a/indra/newview/lleventpoll.h b/indra/newview/lleventpoll.h index d305135b18..65766dbb2a 100644 --- a/indra/newview/lleventpoll.h +++ b/indra/newview/lleventpoll.h @@ -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; |