diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-01-18 00:36:25 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-01-18 00:36:25 +0000 |
| commit | 73f0b5029aa247a563862fc39152ce58baa407aa (patch) | |
| tree | 656b4b9d02c3c81d184ebf2915fe8c073e9335e2 /indra/lscript | |
| parent | 71d28bdbf0baab9302c8f458e3bdbcfc60d656d4 (diff) | |
merge -r 56738:56842 maintenance.
Diffstat (limited to 'indra/lscript')
| -rw-r--r-- | indra/lscript/lscript_alloc.h | 4 | ||||
| -rw-r--r-- | indra/lscript/lscript_library/lscript_library.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/lscript/lscript_alloc.h b/indra/lscript/lscript_alloc.h index f0761c0afd..485a65061a 100644 --- a/indra/lscript/lscript_alloc.h +++ b/indra/lscript/lscript_alloc.h @@ -227,7 +227,7 @@ inline LLScriptLibData *lsa_bubble_sort(LLScriptLibData *src, S32 stride, S32 as return retval; } - LLScriptLibData **sortarray = (LLScriptLibData **)new U32[number]; + LLScriptLibData **sortarray = new LLScriptLibData*[number]; LLScriptLibData *temp = src->mListp; while (temp) @@ -292,7 +292,7 @@ inline LLScriptLibData *lsa_randomize(LLScriptLibData *src, S32 stride) return retval; } - LLScriptLibData **sortarray = (LLScriptLibData **)new U32[number]; + LLScriptLibData **sortarray = new LLScriptLibData*[number]; LLScriptLibData *temp = src->mListp; S32 i = 0; diff --git a/indra/lscript/lscript_library/lscript_library.cpp b/indra/lscript/lscript_library/lscript_library.cpp index 2c2cdbabdc..1af10ae9c4 100644 --- a/indra/lscript/lscript_library/lscript_library.cpp +++ b/indra/lscript/lscript_library/lscript_library.cpp @@ -448,7 +448,7 @@ LLScriptLibraryFunction::~LLScriptLibraryFunction() void LLScriptLibrary::addFunction(LLScriptLibraryFunction *func) { - LLScriptLibraryFunction **temp = (LLScriptLibraryFunction **)new U32[mNextNumber + 1]; + LLScriptLibraryFunction **temp = new LLScriptLibraryFunction*[mNextNumber + 1]; if (mNextNumber) { memcpy(temp, mFunctions, sizeof(LLScriptLibraryFunction *)*mNextNumber); |