diff --git a/mozilla/js2/src/js2execution.cpp b/mozilla/js2/src/js2execution.cpp index f78f0aedd16..b5fffee220c 100644 --- a/mozilla/js2/src/js2execution.cpp +++ b/mozilla/js2/src/js2execution.cpp @@ -2329,7 +2329,7 @@ JSValue JSValue::valueToUInt16(Context *, const JSValue& value) return JSValue((float64)d); } -JSValue JSValue::valueToBoolean(Context *cx, const JSValue& value) +JSValue JSValue::valueToBoolean(Context * /*cx*/, const JSValue& value) { switch (value.tag) { case f64_tag: diff --git a/mozilla/js2/src/js2runtime.cpp b/mozilla/js2/src/js2runtime.cpp index 00dc416db31..d6137305a02 100644 --- a/mozilla/js2/src/js2runtime.cpp +++ b/mozilla/js2/src/js2runtime.cpp @@ -1998,7 +1998,7 @@ static JSValue GlobalObject_ParseInt(Context *cx, const JSValue& /*thisValue*/, const char16 *sBegin = string->begin(); float64 f = 0.0; if (sBegin) - f = stringToInteger(sBegin, string->end(), numEnd, radix); + f = stringToInteger(sBegin, string->end(), numEnd, (uint)radix); return JSValue(f); } @@ -2015,7 +2015,7 @@ static JSValue GlobalObject_ParseFloat(Context *cx, const JSValue& /*thisValue*/ return JSValue(f); } -static JSValue GlobalObject_isNaN(Context *cx, const JSValue& /*thisValue*/, JSValue *argv, uint32 argc) +static JSValue GlobalObject_isNaN(Context *cx, const JSValue& /*thisValue*/, JSValue *argv, uint32 /*argc*/) { float64 f = argv[0].toNumber(cx).f64; if (JSDOUBLE_IS_NaN(f)) @@ -2024,7 +2024,7 @@ static JSValue GlobalObject_isNaN(Context *cx, const JSValue& /*thisValue*/, JSV return kFalseValue; } -static JSValue GlobalObject_isFinite(Context *cx, const JSValue& /*thisValue*/, JSValue *argv, uint32 argc) +static JSValue GlobalObject_isFinite(Context *cx, const JSValue& /*thisValue*/, JSValue *argv, uint32 /*argc*/) { float64 f = argv[0].toNumber(cx).f64; if (JSDOUBLE_IS_FINITE(f)) diff --git a/mozilla/js2/src/js2runtime.h b/mozilla/js2/src/js2runtime.h index b82c2969ec1..db4d0951b89 100644 --- a/mozilla/js2/src/js2runtime.h +++ b/mozilla/js2/src/js2runtime.h @@ -483,7 +483,7 @@ XXX ...couldn't get this to work... Access mAccess; uint16 mDepth; void emitCodeSequence(ByteCodeGen *bcg); - uint16 baseExpressionDepth() { return mDepth + 1; } + uint16 baseExpressionDepth() { return (uint16)(mDepth + 1); } void emitDelete(ByteCodeGen *bcg); }; diff --git a/mozilla/js2/src/jsdate.cpp b/mozilla/js2/src/jsdate.cpp index c011220b7f4..b4f67fb9873 100644 --- a/mozilla/js2/src/jsdate.cpp +++ b/mozilla/js2/src/jsdate.cpp @@ -771,7 +771,7 @@ static JSValue Date_format(Context * /*cx*/, float64 date, formatspec format) } -extern JSValue Date_TypeCast(Context *cx, const JSValue& thisValue, JSValue *argv, uint32 argc) +extern JSValue Date_TypeCast(Context *cx, const JSValue& /*thisValue*/, JSValue * /*argv*/, uint32 /*argc*/) { int64 us, ms, us2ms; float64 msec_time; @@ -861,7 +861,7 @@ JSValue Date_Constructor(Context *cx, const JSValue& thisValue, JSValue *argv, u return thatValue; } -JSValue Date_parse(Context *cx, const JSValue& thisValue, JSValue *argv, uint32 /*argc*/) +JSValue Date_parse(Context *cx, const JSValue& /*thisValue*/, JSValue *argv, uint32 /*argc*/) { const String *str = argv[0].toString(cx).string; float64 d = date_parseString(*str); @@ -869,7 +869,7 @@ JSValue Date_parse(Context *cx, const JSValue& thisValue, JSValue *argv, uint32 return JSValue(d); } -JSValue Date_UTC(Context *cx, const JSValue& thisValue, JSValue *argv, uint32 argc) +JSValue Date_UTC(Context *cx, const JSValue& /*thisValue*/, JSValue *argv, uint32 argc) { float64 array[MAXARGS]; uint32 loop;