Merge mozilla-central to jsdbg2.

2011-07-18 10:58:56 -05:00
parent 5ec36640d1 26c75cc4e0
commit 74a8bfceab
794 changed files with 25241 additions and 20005 deletions
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -581,7 +581,7 @@ array_length_setter(JSContext *cx, JSObject *obj, jsid id, JSBool strict, Value
        return false;

    jsdouble d;
-    if (!ValueToNumber(cx, *vp, &d))
+    if (!ToNumber(cx, *vp, &d))
        return false;

    if (d != newlen) {
@@ -1763,7 +1763,7 @@ sort_compare(void *arg, const void *a, const void *b, int *result)
        return JS_FALSE;

    jsdouble cmp;
-    if (!ValueToNumber(cx, session.rval(), &cmp))
+    if (!ToNumber(cx, session.rval(), &cmp))
        return JS_FALSE;

    /* Clamp cmp to -1, 0, 1. */