diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2015-06-29 17:19:51 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2015-06-29 17:19:51 -0400 |
commit | 80d17b2dd9cdd7a9445480fdb0e12774396751eb (patch) | |
tree | 3129fbbcf7c35ca366e5ee64039fbe03b3050979 /indra/newview/llxmlrpctransaction.cpp | |
parent | 76cb1fcf0b5b9d8415e2517c482bab0c6c6602fb (diff) |
MAINT-4952: Use IntrusivePtr for BufferArray,HttpHeaders,HttpOptions.
Specifically, change the ptr_t typedefs for these LLCore classes to use
IntrusivePtr rather than directly using boost::intrusive_ptr. This allows us
to use a simple ptr_t(raw ptr) constructor rather than having to remember to
code ptr_t(raw ptr, false) everywhere. In fact, the latter form is now invalid:
remove the now-extraneous 'false' constructor parameters.
Diffstat (limited to 'indra/newview/llxmlrpctransaction.cpp')
-rwxr-xr-x | indra/newview/llxmlrpctransaction.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp index 702d0c3a29..066970614a 100755 --- a/indra/newview/llxmlrpctransaction.cpp +++ b/indra/newview/llxmlrpctransaction.cpp @@ -357,7 +357,7 @@ void LLXMLRPCTransaction::Impl::init(XMLRPC_REQUEST request, bool useGzip) } // LLRefCounted starts with a 1 ref, so don't add a ref in the smart pointer - httpOpts = LLCore::HttpOptions::ptr_t(new LLCore::HttpOptions(), false); + httpOpts = LLCore::HttpOptions::ptr_t(new LLCore::HttpOptions()); httpOpts->setTimeout(40L); @@ -368,7 +368,7 @@ void LLXMLRPCTransaction::Impl::init(XMLRPC_REQUEST request, bool useGzip) httpOpts->setSSLVerifyHost( vefifySSLCert ? 2 : 0); // LLRefCounted starts with a 1 ref, so don't add a ref in the smart pointer - httpHeaders = LLCore::HttpHeaders::ptr_t(new LLCore::HttpHeaders(), false); + httpHeaders = LLCore::HttpHeaders::ptr_t(new LLCore::HttpHeaders()); httpHeaders->append(HTTP_OUT_HEADER_CONTENT_TYPE, HTTP_CONTENT_TEXT_XML); @@ -376,7 +376,7 @@ void LLXMLRPCTransaction::Impl::init(XMLRPC_REQUEST request, bool useGzip) //This might help with bug #503 */ //httpOpts->setDNSCacheTimeout(-1); - LLCore::BufferArray::ptr_t body = LLCore::BufferArray::ptr_t(new LLCore::BufferArray(), false); + LLCore::BufferArray::ptr_t body = LLCore::BufferArray::ptr_t(new LLCore::BufferArray()); // TODO: See if there is a way to serialize to a preallocated buffer I'm // not fond of the copy here. |