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-04 14:49:42 -07:00
parent c85845ba0d 32830d05ea
commit ba808c6ca3
731 changed files with 16766 additions and 10301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/jsiter.cpp
View File

@@ -312,10 +312,8 @@ Snapshot(JSContext *cx, JSObject *obj, uintN flags, AutoIdVector *props)
return true;
}
namespace js {
bool
VectorToIdArray(JSContext *cx, AutoIdVector &props, JSIdArray **idap)
js::VectorToIdArray(JSContext *cx, AutoIdVector &props, JSIdArray **idap)
{
JS_STATIC_ASSERT(sizeof(JSIdArray) > sizeof(jsid));
size_t len = props.length();
@@ -332,13 +330,11 @@ VectorToIdArray(JSContext *cx, AutoIdVector &props, JSIdArray **idap)
}
JS_FRIEND_API(bool)
GetPropertyNames(JSContext *cx, JSObject *obj, uintN flags, AutoIdVector *props)
js::GetPropertyNames(JSContext *cx, JSObject *obj, uintN flags, AutoIdVector *props)
{
return Snapshot(cx, obj, flags & (JSITER_OWNONLY | JSITER_HIDDEN), props);
}
}
size_t sCustomIteratorCount = 0;
static inline bool