bug 477706 - fixing most VC 2005 warnings. r=gal,mrbkap
This commit is contained in:
@@ -3861,7 +3861,7 @@ js_NativeGet(JSContext *cx, JSObject *obj, JSObject *pobj,
|
||||
sample = cx->runtime->propertyRemovals;
|
||||
JS_UNLOCK_SCOPE(cx, scope);
|
||||
JS_PUSH_TEMP_ROOT_SPROP(cx, sprop, &tvr);
|
||||
ok = SPROP_GET(cx, sprop, obj, pobj, vp);
|
||||
ok = js_GetSprop(cx, sprop, obj, vp);
|
||||
JS_POP_TEMP_ROOT(cx, &tvr);
|
||||
if (!ok)
|
||||
return JS_FALSE;
|
||||
@@ -3884,7 +3884,7 @@ js_NativeSet(JSContext *cx, JSObject *obj, JSScopeProperty *sprop, jsval *vp)
|
||||
uint32 slot;
|
||||
int32 sample;
|
||||
JSTempValueRooter tvr;
|
||||
bool ok;
|
||||
JSBool ok;
|
||||
|
||||
JS_ASSERT(OBJ_IS_NATIVE(obj));
|
||||
JS_ASSERT(JS_IS_OBJ_LOCKED(cx, obj));
|
||||
@@ -3917,7 +3917,7 @@ js_NativeSet(JSContext *cx, JSObject *obj, JSScopeProperty *sprop, jsval *vp)
|
||||
sample = cx->runtime->propertyRemovals;
|
||||
JS_UNLOCK_SCOPE(cx, scope);
|
||||
JS_PUSH_TEMP_ROOT_SPROP(cx, sprop, &tvr);
|
||||
ok = SPROP_SET(cx, sprop, obj, obj, vp);
|
||||
ok = js_SetSprop(cx, sprop, obj, vp);
|
||||
JS_POP_TEMP_ROOT(cx, &tvr);
|
||||
if (!ok)
|
||||
return JS_FALSE;
|
||||
@@ -4186,7 +4186,7 @@ js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, jsval *vp,
|
||||
return JS_TRUE;
|
||||
}
|
||||
|
||||
return SPROP_SET(cx, sprop, obj, pobj, vp);
|
||||
return js_SetSprop(cx, sprop, obj, vp);
|
||||
}
|
||||
|
||||
/* Restore attrs to the ECMA default for new properties. */
|
||||
|
||||
Reference in New Issue
Block a user