From c0407af8ab181662f6049ae2cf4ca1fd562debe4 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Tue, 12 Jul 2016 11:07:05 -0700
Subject: [PATCH] STORM-2132: Remove obsoleted unique_ptr.hpp, use make_shared
for pointer allocation.
---
indra/newview/lleventpoll.cpp | 4 +++-
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 51967d54a05..cc77b407ae6 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 d305135b18e..65766dbb2a8 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;
--
GitLab