Merge TM -> JM

2011-04-19 08:23:41 -07:00
parent cf03b63a69 7626a05278
commit bf8e7f9212
184 changed files with 8203 additions and 8290 deletions
--- a/js/src/jsdate.cpp
+++ b/js/src/jsdate.cpp
@@ -2144,7 +2144,7 @@ date_toJSON(JSContext *cx, uintN argc, Value *vp)
    if (!cx->stack().pushInvokeArgs(cx, 0, &args))
        return false;

-    args.callee() = toISO;
+    args.calleev() = toISO;
    args.thisv().setObject(*obj);

    if (!Invoke(cx, args, 0))