Merge TM -> JM

2011-05-22 08:59:06 -07:00
parent 88ff98182a a9a873263a
commit 2c1bfca902
1535 changed files with 24621 additions and 86431 deletions
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -289,7 +289,7 @@ BigIndexToId(JSContext *cx, JSObject *obj, jsuint index, JSBool createAtom,
            return JS_TRUE;
        }
    } else {
-        atom = js_AtomizeChars(cx, start, JS_ARRAY_END(buf) - start, 0);
+        atom = js_AtomizeChars(cx, start, JS_ARRAY_END(buf) - start);
        if (!atom)
            return JS_FALSE;
    }