Skip to content
Snippets Groups Projects
Commit 3c46c6bc authored by Rider Linden's avatar Rider Linden
Browse files

Boost unique_ptr into xmlrpc

parent 1ac97766
Branches
Tags
No related merge requests found
...@@ -69,12 +69,14 @@ ...@@ -69,12 +69,14 @@
do this. do this.
*/ */
// *TODO: TSN remove the commented code from this file
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
static const U32 EASY_HANDLE_POOL_SIZE = 5; static const U32 EASY_HANDLE_POOL_SIZE = 5;
static const S32 MULTI_PERFORM_CALL_REPEAT = 5; static const S32 MULTI_PERFORM_CALL_REPEAT = 5;
static const S32 CURL_REQUEST_TIMEOUT = 120; // seconds per operation static const S32 CURL_REQUEST_TIMEOUT = 120; // seconds per operation
static const S32 CURL_CONNECT_TIMEOUT = 30; //seconds to wait for a connection static const S32 CURL_CONNECT_TIMEOUT = 30; //seconds to wait for a connection
//static const S32 MAX_ACTIVE_REQUEST_COUNT = 100; //static const S32 MAX_ACTIVE_REQUEST_COUNT = 100;
// DEBUG // // DEBUG //
......
...@@ -48,6 +48,13 @@ ...@@ -48,6 +48,13 @@
#include "llappviewer.h" #include "llappviewer.h"
#include "lltrans.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 // Static instance of LLXMLRPCListener declared here so that every time we
// bring in this code, we instantiate a listener. If we put the static // bring in this code, we instantiate a listener. If we put the static
// instance of LLXMLRPCListener into llxmlrpclistener.cpp, the linker would // instance of LLXMLRPCListener into llxmlrpclistener.cpp, the linker would
...@@ -168,7 +175,7 @@ class LLXMLRPCTransaction::Handler : public LLCore::HttpHandler ...@@ -168,7 +175,7 @@ class LLXMLRPCTransaction::Handler : public LLCore::HttpHandler
virtual void onCompleted(LLCore::HttpHandle handle, LLCore::HttpResponse * response); 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: private:
...@@ -309,7 +316,7 @@ void LLXMLRPCTransaction::Handler::onCompleted(LLCore::HttpHandle handle, ...@@ -309,7 +316,7 @@ void LLXMLRPCTransaction::Handler::onCompleted(LLCore::HttpHandle handle,
LLXMLRPCTransaction::Impl::Impl(const std::string& uri, LLXMLRPCTransaction::Impl::Impl(const std::string& uri,
XMLRPC_REQUEST request, bool useGzip) XMLRPC_REQUEST request, bool useGzip)
: mHttpRequest(0), : mHttpRequest(),
mStatus(LLXMLRPCTransaction::StatusNotStarted), mStatus(LLXMLRPCTransaction::StatusNotStarted),
mURI(uri), mURI(uri),
mResponse(0) mResponse(0)
...@@ -320,7 +327,7 @@ LLXMLRPCTransaction::Impl::Impl(const std::string& uri, ...@@ -320,7 +327,7 @@ LLXMLRPCTransaction::Impl::Impl(const std::string& uri,
LLXMLRPCTransaction::Impl::Impl(const std::string& uri, LLXMLRPCTransaction::Impl::Impl(const std::string& uri,
const std::string& method, LLXMLRPCValue params, bool useGzip) const std::string& method, LLXMLRPCValue params, bool useGzip)
: mHttpRequest(0), : mHttpRequest(),
mStatus(LLXMLRPCTransaction::StatusNotStarted), mStatus(LLXMLRPCTransaction::StatusNotStarted),
mURI(uri), mURI(uri),
mResponse(0) mResponse(0)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment