Merge from mozilla-central.

2012-02-27 12:40:46 -08:00
parent a0bd5674f8 0f8b1d252d
commit 944ac2e297
525 changed files with 14254 additions and 7015 deletions
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -1040,7 +1040,7 @@ SuppressDeletedPropertyHelper(JSContext *cx, JSObject *obj, StringPredicate pred
                         * Invoke the write barrier on this element, since it's
                         * no longer going to be marked.
                         */
-                        ni->props_end->HeapPtr<JSFlatString>::~HeapPtr<JSFlatString>();
+                        ni->props_end->HeapPtr<JSFlatString>::~HeapPtr();
                    }

                    /* Don't reuse modified native iterators. */