Merge.

2010-10-22 19:11:26 -05:00
parent ca11ff299c 84466fbc82
commit 42faa7bc82
22 changed files with 141 additions and 99 deletions
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -111,7 +111,7 @@ Class js_IteratorClass = {
        NULL,       /* outerObject    */
        NULL,       /* innerObject    */
        iterator_iterator,
-        NULL        /* wrappedObject  */
+        NULL        /* unused */
    }
 };

@@ -1165,7 +1165,7 @@ Class js_GeneratorClass = {
        NULL,       /* outerObject    */
        NULL,       /* innerObject    */
        iterator_iterator,
-        NULL,       /* wrappedObject  */
+        NULL        /* unused */
    }
 };