summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRider Linden <none@none>2015-03-23 13:50:07 -0700
committerRider Linden <none@none>2015-03-23 13:50:07 -0700
commit379c49fc898961b52f98855c926e958df14e98c3 (patch)
treeb19e26aa3b0c7ba8db30949741ca05f346de252b
parente7a1e6198b9bf1b42d60bff9559494887e22d5e7 (diff)
Scratch the unique_ptr for the moment.
-rwxr-xr-xindra/llcorehttp/httpcommon.h21
1 files changed, 13 insertions, 8 deletions
diff --git a/indra/llcorehttp/httpcommon.h b/indra/llcorehttp/httpcommon.h
index 0244755272..2aded492ea 100755
--- a/indra/llcorehttp/httpcommon.h
+++ b/indra/llcorehttp/httpcommon.h
@@ -188,7 +188,6 @@
///
#include "linden_common.h" // Modifies curl/curl.h interfaces
-
#include <string>
namespace LLCore
@@ -292,24 +291,29 @@ struct HttpStatus
HttpStatus()
{
- mDetails = std::unique_ptr<Details>(new Details(LLCORE, HE_SUCCESS));
- }
+ mDetails = new Details(LLCORE, HE_SUCCESS);
+ }
HttpStatus(type_enum_t type, short status)
{
- mDetails = std::unique_ptr<Details>(new Details(type, status));
+ mDetails = new Details(type, status);
}
HttpStatus(int http_status)
{
- mDetails = std::unique_ptr<Details>(new Details(http_status,
- (http_status >= 200 && http_status <= 299) ? HE_SUCCESS : HE_REPLY_ERROR));
+ mDetails = new Details(http_status,
+ (http_status >= 200 && http_status <= 299) ? HE_SUCCESS : HE_REPLY_ERROR);
llassert(http_status >= 100 && http_status <= 999);
}
HttpStatus(const HttpStatus & rhs)
{
- mDetails = std::unique_ptr<Details>(new Details(*rhs.mDetails));
+ mDetails = new Details(*rhs.mDetails);
+ }
+
+ ~HttpStatus()
+ {
+ delete mDetails;
}
HttpStatus & operator=(const HttpStatus & rhs)
@@ -468,7 +472,8 @@ private:
void * mErrorData;
};
- std::unique_ptr<Details> mDetails;
+ //boost::unique_ptr<Details> mDetails;
+ Details * mDetails;
}; // end struct HttpStatus