From efcd6ffbea98fabd3e75ec7ac0fe5f5e77c10c58 Mon Sep 17 00:00:00 2001 From: Eddy Bruel Date: Fri, 1 Jun 2012 13:19:06 +0200 Subject: [PATCH] Bug 703537 - Followup: fix conflicts. --- js/src/jswrapper.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/src/jswrapper.cpp b/js/src/jswrapper.cpp index 2590a5b4b639..d4ea544b8f0a 100644 --- a/js/src/jswrapper.cpp +++ b/js/src/jswrapper.cpp @@ -177,21 +177,21 @@ DirectWrapper::hasOwn(JSContext *cx, JSObject *wrapper, jsid id, bool *bp) } bool -Wrapper::get(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id, Value *vp) +DirectWrapper::get(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id, Value *vp) { vp->setUndefined(); // default result if we refuse to perform this action GET(wrappedObject(wrapper)->getGeneric(cx, RootedObject(cx, receiver), RootedId(cx, id), vp)); } bool -Wrapper::set(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id, bool strict, +DirectWrapper::set(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id, bool strict, Value *vp) { SET(wrappedObject(wrapper)->setGeneric(cx, RootedId(cx, id), vp, strict)); } bool -Wrapper::keys(JSContext *cx, JSObject *wrapper, AutoIdVector &props) +DirectWrapper::keys(JSContext *cx, JSObject *wrapper, AutoIdVector &props) { // if we refuse to perform this action, props remains empty const jsid id = JSID_VOID;