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

Merge from mozilla-central.

Browse Source
This commit is contained in:
David Anderson
2012-03-05 17:50:51 -08:00
parent dec60dbcbf 9e7e5e519e
commit 4d9ec86617
512 changed files with 44230 additions and 32099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/jsiter.cpp
View File

@@ -426,9 +426,9 @@ js::VectorToIdArray(JSContext *cx, AutoIdVector &props, JSIdArray **idap)
if (!ida)
return false;
ida->length = static_cast<jsint>(len);
ida->length = static_cast<int>(len);
jsid *v = props.begin();
for (jsint i = 0; i < ida->length; i++)
for (int i = 0; i < ida->length; i++)
ida->vector[i].init(v[i]);
*idap = ida;
return true;
@@ -1283,7 +1283,7 @@ js_IteratorNext(JSContext *cx, JSObject *iterobj, Value *rval)
return true;
JSString *str;
jsint i;
int i;
if (rval->isInt32() && StaticStrings::hasInt(i = rval->toInt32())) {
str = cx->runtime->staticStrings.getInt(i);
} else {