corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge MC -> JM

Browse Source
This commit is contained in:
Brian Hackett
2011-10-27 14:16:02 -07:00
parent b1938fb0c3 2ebcd04ee5
commit 0f1e7be714
1077 changed files with 25323 additions and 18340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/jsiter.cpp
View File

@@ -880,7 +880,7 @@ SuppressDeletedPropertyHelper(JSContext *cx, JSObject *obj, IdPredicate predicat
uintN attrs;
if (obj2.object()->isNative())
attrs = ((Shape *) prop)->attributes();
else if (!obj2.object()->getAttributes(cx, *idp, &attrs))
else if (!obj2.object()->getGenericAttributes(cx, *idp, &attrs))
return false;
if (attrs & JSPROP_ENUMERATE)