diff options
author | Merov Linden <merov@lindenlab.com> | 2012-10-17 19:33:09 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-10-17 19:33:09 -0700 |
commit | ec9260701feaa9ae1453c57f0f70449bb9b60af2 (patch) | |
tree | 9a6e74ee503c956dc8f13851f3ff0da712861b08 /indra/llmessage/tests/llhttpclient_test.cpp | |
parent | e56145176875a09dc9e1524a47bcc1259582c896 (diff) | |
parent | 49ad7fd4b57cec635c557070be02556094e90ff6 (diff) |
Pull merge from richard/viewer-chui
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); |