diff options
author | simon <none@none> | 2014-05-07 10:56:41 -0700 |
---|---|---|
committer | simon <none@none> | 2014-05-07 10:56:41 -0700 |
commit | 250db74bf9325acdc1169f6c13d297e7fe44b753 (patch) | |
tree | c6926efeefeb10ec3a36b296aa1ac7bd8521e0e3 /indra/lscript/lscript_compile/lscript_tree.h | |
parent | 676bad148a72c235ec79742e3f490ca66b4f40d0 (diff) | |
parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) |
Pull and merge viewer-release as version 3.7.8
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; |