зеркало из https://github.com/mozilla/gecko-dev.git
bug=421314 r=myself a1.9=beltzner Patch from Mike Moening to fix VC2005 warnings that my recent changes introduced.
This commit is contained in:
Родитель
833ed276ba
Коммит
e73c273de4
|
@ -1022,8 +1022,8 @@ InitGCArenaLists(JSRuntime *rt)
|
|||
thingSize = GC_FREELIST_NBYTES(i);
|
||||
JS_ASSERT((size_t)(uint16)thingSize == thingSize);
|
||||
arenaList->last = NULL;
|
||||
arenaList->lastCount = THINGS_PER_ARENA(thingSize);
|
||||
arenaList->thingSize = (uint16)thingSize;
|
||||
arenaList->lastCount = (uint16) THINGS_PER_ARENA(thingSize);
|
||||
arenaList->thingSize = (uint16) thingSize;
|
||||
arenaList->freeList = NULL;
|
||||
}
|
||||
rt->gcDoubleArenaList.first = NULL;
|
||||
|
@ -3346,7 +3346,7 @@ js_GC(JSContext *cx, JSGCInvocationKind gckind)
|
|||
*/
|
||||
freeList = arenaList->freeList;
|
||||
if (a == arenaList->last)
|
||||
arenaList->lastCount = indexLimit;
|
||||
arenaList->lastCount = (uint16) indexLimit;
|
||||
*ap = a->prev;
|
||||
a->prev = emptyArenas;
|
||||
emptyArenas = a;
|
||||
|
|
|
@ -3434,7 +3434,7 @@ DeepCopyInLRS(JSContext *cx, JSXML *xml, uintN flags)
|
|||
/* Our caller must be protecting newborn objects. */
|
||||
JS_ASSERT(cx->localRootStack);
|
||||
|
||||
JS_CHECK_RECURSION(cx, return JS_FALSE);
|
||||
JS_CHECK_RECURSION(cx, return NULL);
|
||||
|
||||
copy = js_NewXML(cx, (JSXMLClass) xml->xml_class);
|
||||
if (!copy)
|
||||
|
|
Загрузка…
Ссылка в новой задаче