Merge from mozilla-central.

2012-05-09 12:31:01 -07:00
parent 6e325e9333 76a5365245
commit 132cb9b12c
301 changed files with 14239 additions and 2910 deletions
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -1334,8 +1334,8 @@ Class js::StopIterationClass = {
    NULL,                    /* finalize    */
    NULL,                    /* checkAccess */
    NULL,                    /* call        */
-    NULL,                    /* construct   */
-    stopiter_hasInstance
+    stopiter_hasInstance,
+    NULL                     /* construct   */
 };

 #if JS_HAS_GENERATORS