зеркало из https://github.com/mozilla/gecko-dev.git
Bug 554850: silence JSBool -> bool conversion warnings in msvc. r=waldo
This commit is contained in:
Родитель
f8296cc3ed
Коммит
c53682fd7e
|
@ -2292,9 +2292,9 @@ array_sort(JSContext *cx, uintN argc, jsval *vp)
|
|||
ca.elemroot = js_AllocStack(cx, 2 + 2, &mark);
|
||||
if (!ca.elemroot)
|
||||
return false;
|
||||
bool ok = js_MergeSort(vec, size_t(newlen), sizeof(jsval),
|
||||
comparator_stack_cast(sort_compare),
|
||||
&ca, mergesort_tmp);
|
||||
bool ok = !!js_MergeSort(vec, size_t(newlen), sizeof(jsval),
|
||||
comparator_stack_cast(sort_compare),
|
||||
&ca, mergesort_tmp);
|
||||
js_FreeStack(cx, mark);
|
||||
if (!ok)
|
||||
return false;
|
||||
|
|
|
@ -1695,7 +1695,7 @@ js_XDRFunctionObject(JSXDRState *xdr, JSObject **objp)
|
|||
}
|
||||
#endif
|
||||
for (i = 0; i != bitmapLength; ++i) {
|
||||
ok = JS_XDRUint32(xdr, &bitmap[i]);
|
||||
ok = !!JS_XDRUint32(xdr, &bitmap[i]);
|
||||
if (!ok)
|
||||
goto release_mark;
|
||||
}
|
||||
|
@ -1704,7 +1704,7 @@ js_XDRFunctionObject(JSXDRState *xdr, JSObject **objp)
|
|||
!(bitmap[i >> JS_BITS_PER_UINT32_LOG2] &
|
||||
JS_BIT(i & (JS_BITS_PER_UINT32 - 1)))) {
|
||||
if (xdr->mode == JSXDR_DECODE) {
|
||||
ok = js_AddLocal(xdr->cx, fun, NULL, JSLOCAL_ARG);
|
||||
ok = !!js_AddLocal(xdr->cx, fun, NULL, JSLOCAL_ARG);
|
||||
if (!ok)
|
||||
goto release_mark;
|
||||
} else {
|
||||
|
@ -1714,7 +1714,7 @@ js_XDRFunctionObject(JSXDRState *xdr, JSObject **objp)
|
|||
}
|
||||
if (xdr->mode == JSXDR_ENCODE)
|
||||
name = JS_LOCAL_NAME_TO_ATOM(names[i]);
|
||||
ok = js_XDRStringAtom(xdr, &name);
|
||||
ok = !!js_XDRStringAtom(xdr, &name);
|
||||
if (!ok)
|
||||
goto release_mark;
|
||||
if (xdr->mode == JSXDR_DECODE) {
|
||||
|
@ -1726,7 +1726,7 @@ js_XDRFunctionObject(JSXDRState *xdr, JSObject **objp)
|
|||
? JSLOCAL_CONST
|
||||
: JSLOCAL_VAR)
|
||||
: JSLOCAL_UPVAR;
|
||||
ok = js_AddLocal(xdr->cx, fun, name, localKind);
|
||||
ok = !!js_AddLocal(xdr->cx, fun, name, localKind);
|
||||
if (!ok)
|
||||
goto release_mark;
|
||||
}
|
||||
|
|
|
@ -753,9 +753,9 @@ js_NewPrinter(JSContext *cx, const char *name, JSFunction *fun,
|
|||
INIT_SPRINTER(cx, &jp->sprinter, &jp->pool, 0);
|
||||
JS_InitArenaPool(&jp->pool, name, 256, 1, &cx->scriptStackQuota);
|
||||
jp->indent = indent;
|
||||
jp->pretty = pretty;
|
||||
jp->grouped = grouped;
|
||||
jp->strict = strict;
|
||||
jp->pretty = !!pretty;
|
||||
jp->grouped = !!grouped;
|
||||
jp->strict = !!strict;
|
||||
jp->script = NULL;
|
||||
jp->dvgfence = NULL;
|
||||
jp->pcstack = NULL;
|
||||
|
|
Загрузка…
Ссылка в новой задаче