wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Followup bustage fix for bug 952873 to fix CLOSED TREE

Browse Source
This commit is contained in:
Boris Zbarsky 2014-01-28 17:54:31 -08:00
parent f758b99283
commit a2592ffba7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/jsapi.h
View File

@ -4846,14 +4846,14 @@ class MOZ_STACK_CLASS JS_PUBLIC_API(ForOfIterator) {
* of throwing. Callers should then check valueIsIterable() before
* continuing with the iteration.
*/
JS_PUBLIC_API(bool) init(JS::HandleValue iterable,
NonIterableBehavior nonIterableBehavior = ThrowOnNonIterable);
bool init(JS::HandleValue iterable,
NonIterableBehavior nonIterableBehavior = ThrowOnNonIterable);
/*
* Get the next value from the iterator. If false *done is true
* after this call, do not examine val.
*/
JS_PUBLIC_API(bool) next(JS::MutableHandleValue val, bool *done);
bool next(JS::MutableHandleValue val, bool *done);
/*
* If initialized with throwOnNonCallable = false, check whether

5
js/src/jsiter.cpp
View File

@ -15,7 +15,6 @@
#include "jsarray.h"
#include "jsatom.h"
#include "jscntxt.h"
#include "jsfriendapi.h"
#include "jsgc.h"
#include "jsobj.h"
#include "jsopcode.h"
@ -1270,7 +1269,7 @@ const Class StopIterationObject::class_ = {
nullptr /* construct */
};
JS_FRIEND_API(bool)
bool
ForOfIterator::init(HandleValue iterable, NonIterableBehavior nonIterableBehavior)
{
JSContext *cx = cx_;
@ -1314,7 +1313,7 @@ ForOfIterator::init(HandleValue iterable, NonIterableBehavior nonIterableBehavio
return true;
}
JS_FRIEND_API(bool)
bool
ForOfIterator::next(MutableHandleValue vp, bool *done)
{
JS_ASSERT(iterator);

1
js/src/vm/Interpreter.cpp
View File

@ -59,6 +59,7 @@ using namespace js::types;
using mozilla::DebugOnly;
using mozilla::DoubleEqualsInt32;
using mozilla::PodCopy;
using JS::ForOfIterator;
/*
* Note: when Clang 3.2 (32-bit) inlines the two functions below in Interpret,