diff options
| author | Richard Linden <none@none> | 2013-10-08 11:59:24 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-10-08 11:59:24 -0700 |
| commit | 80dfbbaacd82179e54163ed48b1bc444e3becbd5 (patch) | |
| tree | da3858b58b5ec9c34d6eefa60c4fe87fc5743249 /indra/lscript/lscript_compile/lscript_tree.h | |
| parent | f7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff) | |
| parent | 2eeee8a9491398697a8f3167bc4f715a3970fc3a (diff) | |
merge from viewer-release
Diffstat (limited to 'indra/lscript/lscript_compile/lscript_tree.h')
| -rwxr-xr-x | indra/lscript/lscript_compile/lscript_tree.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/indra/lscript/lscript_compile/lscript_tree.h b/indra/lscript/lscript_compile/lscript_tree.h index bf29f44518..047c220b17 100755 --- a/indra/lscript/lscript_compile/lscript_tree.h +++ b/indra/lscript/lscript_compile/lscript_tree.h @@ -29,7 +29,6 @@ #include "v3math.h" #include "llquaternion.h" -#include "linked_lists.h" #include "lscript_error.h" #include "lscript_typecheck.h" #include "lscript_byteformat.h" @@ -2304,20 +2303,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; |