diff options
author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-10-18 22:29:02 +0300 |
---|---|---|
committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-10-18 22:29:02 +0300 |
commit | c43cfcdcbd243410e2f780f58f93100e96fc996c (patch) | |
tree | d5daa0187843a9302c1011937d452d40692d0d1a /indra/newview/tests | |
parent | c0b60841ce14a1c449ede17284d2aa6939322be3 (diff) | |
parent | f9c068462f379a4678e59090a066cfa173504c6b (diff) |
merge into latest changes
Diffstat (limited to 'indra/newview/tests')
-rw-r--r-- | indra/newview/tests/lltranslate_test.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/tests/lltranslate_test.cpp b/indra/newview/tests/lltranslate_test.cpp index 10e37fae97..fd9527d631 100644 --- a/indra/newview/tests/lltranslate_test.cpp +++ b/indra/newview/tests/lltranslate_test.cpp @@ -299,11 +299,6 @@ LLControlGroup::LLControlGroup(const std::string& name) : LLInstanceTracker<LLCo std::string LLControlGroup::getString(const std::string& name) { return "dummy"; } LLControlGroup::~LLControlGroup() {} -namespace boost { - void intrusive_ptr_add_ref(LLCurl::Responder*) {} - void intrusive_ptr_release(LLCurl::Responder*) {} -} - LLCurl::Responder::Responder() {} void LLCurl::Responder::completedHeader(U32, std::string const&, LLSD const&) {} void LLCurl::Responder::completedRaw(U32, const std::string&, const LLChannelDescriptors&, const LLIOPipe::buffer_ptr_t& buffer) {} @@ -314,7 +309,7 @@ void LLCurl::Responder::result(LLSD const&) {} LLCurl::Responder::~Responder() {} void LLHTTPClient::get(const std::string&, const LLSD&, ResponderPtr, const LLSD&, const F32) {} -void LLHTTPClient::get(const std::string&, boost::intrusive_ptr<LLCurl::Responder>, const LLSD&, const F32) {} +void LLHTTPClient::get(const std::string&, LLPointer<LLCurl::Responder>, const LLSD&, const F32) {} LLBufferStream::LLBufferStream(const LLChannelDescriptors& channels, LLBufferArray* buffer) : std::iostream(&mStreamBuf), mStreamBuf(channels, buffer) {} |