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

bug 549010 - fixing and silencing MSVC warnings. r=brendan,igor

Browse Source
This commit is contained in:
Mike Moening
2010-03-04 20:44:09 -08:00
parent 0e0ab159cb
commit 46a40846b5
39 changed files with 260 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/jsiter.cpp
View File

@@ -180,7 +180,7 @@ InitNativeIterator(JSContext *cx, JSObject *iterobj, JSObject *obj, uintN flags)
* store the original object.
*/
JS_ASSERT(obj != iterobj);
STOBJ_SET_PROTO(iterobj, obj);
iterobj->setProto(obj);
}
return JS_TRUE;
}
@@ -484,7 +484,7 @@ CallEnumeratorNext(JSContext *cx, JSObject *iterobj, uintN flags, jsval *rval)
JS_ASSERT(STOBJ_GET_CLASS(iterobj) == &js_IteratorClass);
obj = STOBJ_GET_PARENT(iterobj);
origobj = STOBJ_GET_PROTO(iterobj);
origobj = iterobj->getProto();
state = STOBJ_GET_SLOT(iterobj, JSSLOT_ITER_STATE);
if (JSVAL_IS_NULL(state))
goto stop;
@@ -530,7 +530,7 @@ CallEnumeratorNext(JSContext *cx, JSObject *iterobj, uintN flags, jsval *rval)
} else
#endif
{
obj = OBJ_GET_PROTO(cx, obj);
obj = obj->getProto();
if (obj) {
STOBJ_SET_PARENT(iterobj, obj);
if (!obj->enumerate(cx, JSENUMERATE_INIT, &state, NULL))