livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OSX: clang does not know about std::shared_ptr.

meow-7.2.2
Nicky 2016-04-21 15:37:06 +02:00
parent 72d4bc92c9
commit 84a33ae4ad
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/fsfloaterimport.cpp
View File

@ -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;