diff options
author | Kelly Washington <kelly@lindenlab.com> | 2012-10-25 16:13:39 -0700 |
---|---|---|
committer | Kelly Washington <kelly@lindenlab.com> | 2012-10-25 16:13:39 -0700 |
commit | 0cdff2817bdc342e0ac8b3c8711e3f7a72f1f617 (patch) | |
tree | 0fbaca9292450f05588336eb6639b12d182156e1 /indra/llmessage/tests/llhttpclient_test.cpp | |
parent | 03fa24f8aecc071bac920a400c122cbce0b029b4 (diff) | |
parent | 1743e6a81330824021667000f8acdd6cf64dbf1b (diff) |
Merge
Diffstat (limited to 'indra/llmessage/tests/llhttpclient_test.cpp')
-rw-r--r-- | indra/llmessage/tests/llhttpclient_test.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llmessage/tests/llhttpclient_test.cpp b/indra/llmessage/tests/llhttpclient_test.cpp index e338d4ec71..a2be307cc8 100644 --- a/indra/llmessage/tests/llhttpclient_test.cpp +++ b/indra/llmessage/tests/llhttpclient_test.cpp @@ -189,9 +189,9 @@ namespace tut } public: - static boost::intrusive_ptr<Result> build(HTTPClientTestData& client) + static Result* build(HTTPClientTestData& client) { - return boost::intrusive_ptr<Result>(new Result(client)); + return new Result(client); } ~Result() @@ -258,7 +258,6 @@ namespace tut void HTTPClientTestObject::test<1>() { LLHTTPClient::get(local_server, newResult()); - runThePump(); ensureStatusOK(); ensure("result object wasn't destroyed", mResultDeleted); |