No longer include llerrorlegacy.h. Updated llstl to include deletion utilites.
This commit is contained in:
@@ -314,7 +314,7 @@ void LLScriptScriptCodeChunk::build(LLFILE *efp, LLFILE *bcfp)
|
||||
|
||||
if (fwrite(mCompleteCode, 1, mTotalSize, bcfp) != (size_t)mTotalSize)
|
||||
{
|
||||
llwarns << "Short write" << llendl;
|
||||
LL_WARNS() << "Short write" << LL_ENDL;
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
#ifndef LL_LSCRIPT_SCOPE_H
|
||||
#define LL_LSCRIPT_SCOPE_H
|
||||
|
||||
#include "string_table.h"
|
||||
#include "llstringtable.h"
|
||||
#include "llmap.h"
|
||||
#include "lscript_byteformat.h"
|
||||
|
||||
|
||||
@@ -35,7 +35,6 @@
|
||||
|
||||
#include "v3math.h"
|
||||
#include "llquaternion.h"
|
||||
#include "linked_lists.h"
|
||||
#include "lscript_error.h"
|
||||
#include "lscript_typecheck.h"
|
||||
#include "lscript_byteformat.h"
|
||||
@@ -2310,20 +2309,20 @@ public:
|
||||
LLScriptAllocationManager() {}
|
||||
~LLScriptAllocationManager()
|
||||
{
|
||||
mAllocationList.deleteAllData();
|
||||
deleteAllocations();
|
||||
}
|
||||
|
||||
void addAllocation(LLScriptFilePosition *ptr)
|
||||
{
|
||||
mAllocationList.addData(ptr);
|
||||
mAllocationList.push_front(ptr);
|
||||
}
|
||||
|
||||
void deleteAllocations()
|
||||
{
|
||||
mAllocationList.deleteAllData();
|
||||
delete_and_clear(mAllocationList);
|
||||
}
|
||||
|
||||
LLLinkedList<LLScriptFilePosition> mAllocationList;
|
||||
std::list<LLScriptFilePosition*> mAllocationList;
|
||||
};
|
||||
|
||||
extern LLScriptAllocationManager *gAllocationManager;
|
||||
|
||||
Reference in New Issue
Block a user