summaryrefslogtreecommitdiff
path: root/indra/llmessage/tests/llhttpclient_test.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-11-19 11:09:58 -0500
committerOz Linden <oz@lindenlab.com>2012-11-19 11:09:58 -0500
commitb7f8a2479249646c7fb38ead195d5197ab733c94 (patch)
treec1bf4a2b0ecac69a4705827a042ea7f0224ebc54 /indra/llmessage/tests/llhttpclient_test.cpp
parentc94756d92c7353cb91bfddb5e342f825457e1a7e (diff)
parentf8749ec9bd03072cc5b50f4cb1a61289b2989c72 (diff)
merge up to 3.4.1-release
Diffstat (limited to 'indra/llmessage/tests/llhttpclient_test.cpp')
-rw-r--r--indra/llmessage/tests/llhttpclient_test.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/tests/llhttpclient_test.cpp b/indra/llmessage/tests/llhttpclient_test.cpp
index 843c3bcc4b..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()