diff options
author | Don Kjer <don@lindenlab.com> | 2012-11-28 23:46:06 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2012-11-28 23:46:06 +0000 |
commit | 96ef49df75c0248e4843f9a5b53f010b819d59f3 (patch) | |
tree | 9f542fae939073bbb39464500d3fd477d1ed5fe5 /indra/llmessage/tests/llhttpclient_test.cpp | |
parent | dc71cae16b9c49a1d6b4d4a888c3a574049fd087 (diff) | |
parent | e0432f98ee515f9777604aa784d28b63d2abfe40 (diff) |
Automated 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 4a9db7cd98..50f1df608f 100644 --- a/indra/llmessage/tests/llhttpclient_test.cpp +++ b/indra/llmessage/tests/llhttpclient_test.cpp @@ -137,9 +137,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() @@ -206,7 +206,6 @@ namespace tut void HTTPClientTestObject::test<1>() { LLHTTPClient::get(local_server, newResult()); - runThePump(); ensureStatusOK(); ensure("result object wasn't destroyed", mResultDeleted); |