From 84a33ae4adf67ae5fa71939ce2d728431dba8b4f Mon Sep 17 00:00:00 2001 From: Nicky Date: Thu, 21 Apr 2016 15:37:06 +0200 Subject: [PATCH] OSX: clang does not know about std::shared_ptr. --- indra/newview/fsfloaterimport.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/indra/newview/fsfloaterimport.cpp b/indra/newview/fsfloaterimport.cpp index fc92c30ec5..a792fec115 100644 --- a/indra/newview/fsfloaterimport.cpp +++ b/indra/newview/fsfloaterimport.cpp @@ -26,7 +26,6 @@ */ #include "llviewerprecompiledheaders.h" - #include "fsfloaterimport.h" #include "llagent.h" @@ -87,7 +86,7 @@ void resourceDeleter( LLResourceData *aData ) delete aData; } -void uploadCoroutine( LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &a_httpAdapter, std::string aURL, LLSD aBody, LLAssetID aAssetId, LLAssetType::EType aAssetType, std::shared_ptr< LLResourceData > aResourceData ); +void uploadCoroutine( LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &a_httpAdapter, std::string aURL, LLSD aBody, LLAssetID aAssetId, LLAssetType::EType aAssetType, boost::shared_ptr< LLResourceData > aResourceData ); FSFloaterImport::FSFloaterImport(const LLSD& filename) : LLFloater(filename), @@ -1502,7 +1501,7 @@ void FSFloaterImport::uploadAsset(LLUUID asset_id, LLUUID inventory_item) } - std::shared_ptr< LLResourceData> pData( data, resourceDeleter ); + boost::shared_ptr< LLResourceData> pData( data, resourceDeleter ); LLCoprocedureManager::instance().enqueueCoprocedure( "FSImporter", "Upload asset", boost::bind( uploadCoroutine, _1, url, body, new_asset_id, asset_type, pData ) ); @@ -1864,7 +1863,7 @@ public: } }; -void uploadCoroutine( LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &a_httpAdapter, std::string aURL, LLSD aBody, LLAssetID aAssetId, LLAssetType::EType aAssetType, std::shared_ptr< LLResourceData > aResourceData ) +void uploadCoroutine( LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &a_httpAdapter, std::string aURL, LLSD aBody, LLAssetID aAssetId, LLAssetType::EType aAssetType, boost::shared_ptr< LLResourceData > aResourceData ) { FSResourceData* fs_data = (FSResourceData*)aResourceData->mUserData; FSFloaterImport* self = fs_data->mFloater;