Boost unique_ptr into xmlrpc

1 files changed, 10 insertions, 3 deletions

diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp
index 2270b840a0..f7b886b2d2 100755
--- a/indra/newview/llxmlrpctransaction.cpp
+++ b/indra/newview/llxmlrpctransaction.cpp
@@ -48,6 +48,13 @@
 #include "llappviewer.h"
 #include "lltrans.h"
 
+#include "boost/move/unique_ptr.hpp"
+
+namespace boost
+{
+	using ::boost::movelib::unique_ptr; // move unique_ptr into the boost namespace.
+}
+
 // Static instance of LLXMLRPCListener declared here so that every time we
 // bring in this code, we instantiate a listener. If we put the static
 // instance of LLXMLRPCListener into llxmlrpclistener.cpp, the linker would
@@ -168,7 +175,7 @@ public:
 
 	virtual void onCompleted(LLCore::HttpHandle handle, LLCore::HttpResponse * response);
 
-	typedef std::unique_ptr<LLXMLRPCTransaction::Handler> ptr_t;
+	typedef boost::unique_ptr<LLXMLRPCTransaction::Handler> ptr_t;
 
 private:
 
@@ -309,7 +316,7 @@ void LLXMLRPCTransaction::Handler::onCompleted(LLCore::HttpHandle handle,
 
 LLXMLRPCTransaction::Impl::Impl(const std::string& uri,
 		XMLRPC_REQUEST request, bool useGzip)
-	: mHttpRequest(0),
+	: mHttpRequest(),
 	  mStatus(LLXMLRPCTransaction::StatusNotStarted),
 	  mURI(uri),
 	  mResponse(0)
@@ -320,7 +327,7 @@ LLXMLRPCTransaction::Impl::Impl(const std::string& uri,
 
 LLXMLRPCTransaction::Impl::Impl(const std::string& uri,
 		const std::string& method, LLXMLRPCValue params, bool useGzip)
-	: mHttpRequest(0),
+	: mHttpRequest(),
 	  mStatus(LLXMLRPCTransaction::StatusNotStarted),
 	  mURI(uri),
 	  mResponse(0)