зеркало из https://github.com/mozilla/gecko-dev.git
No bug, fixing a new MSVC warnings, no_r=me
This commit is contained in:
Родитель
a893ae99fc
Коммит
c96de3c446
|
@ -3411,7 +3411,7 @@ FireGCEnd(JSContext *cx, JSGCInvocationKind gckind)
|
||||||
* interlock mechanism here.
|
* interlock mechanism here.
|
||||||
*/
|
*/
|
||||||
if (gckind != GC_SET_SLOT_REQUEST && callback) {
|
if (gckind != GC_SET_SLOT_REQUEST && callback) {
|
||||||
Conditionally<AutoUnlockGC> unlockIf(gckind & GC_LOCK_HELD, rt);
|
Conditionally<AutoUnlockGC> unlockIf(!!(gckind & GC_LOCK_HELD), rt);
|
||||||
|
|
||||||
(void) callback(cx, JSGC_END);
|
(void) callback(cx, JSGC_END);
|
||||||
|
|
||||||
|
|
|
@ -712,7 +712,7 @@ ProcessArgs(JSContext *cx, JSObject *obj, char **argv, int argc)
|
||||||
case 'Z':
|
case 'Z':
|
||||||
if (++i == argc)
|
if (++i == argc)
|
||||||
return usage();
|
return usage();
|
||||||
JS_SetGCZeal(cx, atoi(argv[i]));
|
JS_SetGCZeal(cx, !!(atoi(argv[i])));
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -3056,7 +3056,7 @@ EvalInFrame(JSContext *cx, uintN argc, jsval *vp)
|
||||||
JSString *str = JSVAL_TO_STRING(argv[1]);
|
JSString *str = JSVAL_TO_STRING(argv[1]);
|
||||||
|
|
||||||
bool saveCurrent = (argc >= 3 && JSVAL_IS_BOOLEAN(argv[2]))
|
bool saveCurrent = (argc >= 3 && JSVAL_IS_BOOLEAN(argv[2]))
|
||||||
? (bool)JSVAL_TO_SPECIAL(argv[2])
|
? !!(JSVAL_TO_SPECIAL(argv[2]))
|
||||||
: false;
|
: false;
|
||||||
|
|
||||||
JS_ASSERT(cx->fp);
|
JS_ASSERT(cx->fp);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче