From 72d4bc92c96c5cff7dc8a40fc6873c8ce595a050 Mon Sep 17 00:00:00 2001 From: Nicky Date: Thu, 21 Apr 2016 15:36:29 +0200 Subject: [PATCH] OSX could not convert from NULL to LLCore::HttpHeaders::ptr_t. --- indra/llmessage/fscorehttputil.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/indra/llmessage/fscorehttputil.h b/indra/llmessage/fscorehttputil.h index 5da2a72441..3bb2e9e5c4 100644 --- a/indra/llmessage/fscorehttputil.h +++ b/indra/llmessage/fscorehttputil.h @@ -3,10 +3,13 @@ namespace FSCoreHttpUtil { typedef boost::function completionCallback_t; - void callbackHttpPostRaw(const std::string &url, std::string postData, completionCallback_t success = NULL, completionCallback_t failure = NULL, LLCore::HttpHeaders::ptr_t aHeader = NULL ); - void callbackHttpGetRaw(const std::string &url, completionCallback_t success = NULL, completionCallback_t failure = NULL, LLCore::HttpHeaders::ptr_t aHeader = NULL); + void callbackHttpPostRaw(const std::string &url, std::string postData, completionCallback_t success = NULL, completionCallback_t failure = NULL, + LLCore::HttpHeaders::ptr_t aHeader = LLCore::HttpHeaders::ptr_t() ); + void callbackHttpGetRaw(const std::string &url, completionCallback_t success = NULL, completionCallback_t failure = NULL, + LLCore::HttpHeaders::ptr_t aHeader = LLCore::HttpHeaders::ptr_t() ); void trivialGetCoroRaw(std::string url, LLCore::HttpRequest::policy_t policyId, LLCore::HttpHeaders::ptr_t aHeader, completionCallback_t success, completionCallback_t failure); - void trivialPostCoroRaw(std::string url, LLCore::HttpRequest::policy_t policyId, LLCore::BufferArray::ptr_t postData, LLCore::HttpHeaders::ptr_t aHeader, completionCallback_t success, completionCallback_t failure); + void trivialPostCoroRaw(std::string url, LLCore::HttpRequest::policy_t policyId, LLCore::BufferArray::ptr_t postData, LLCore::HttpHeaders::ptr_t aHeader, + completionCallback_t success, completionCallback_t failure); }