Menu
▾
▴
SF.net SVN: openvrml:[4312] branches/0.18
|
From: <br...@us...> - 2012-08-19 04:36:27
|
Revision: 4312
http://openvrml.svn.sourceforge.net/openvrml/?rev=4312&view=rev
Author: braden
Date: 2012-08-19 04:36:20 +0000 (Sun, 19 Aug 2012)
Log Message:
-----------
JS_SetPrivate no longer returns a boolean value.
Modified Paths:
--------------
branches/0.18/ChangeLog
branches/0.18/src/script/javascript.cpp
Property Changed:
----------------
branches/0.18/
Property changes on: branches/0.18
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274,4276,4278,4280-4281,4283,4285,4287,4292,4294,4296,4298,4300,4302,4304,4306,4308-4309
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274,4276,4278,4280-4281,4283,4285,4287,4292,4294,4296,4298,4300,4302,4304,4306,4308-4309,4311
Modified: branches/0.18/ChangeLog
===================================================================
--- branches/0.18/ChangeLog 2012-08-19 04:28:52 UTC (rev 4311)
+++ branches/0.18/ChangeLog 2012-08-19 04:36:20 UTC (rev 4312)
@@ -1,3 +1,8 @@
+2012-08-19 Braden McDaniel <br...@en...>
+
+ * src/script/javascript.cpp: JS_SetPrivate no longer returns a
+ boolean value.
+
2012-08-18 Braden McDaniel <br...@en...>
XULRunner 14.0 removes the JSContext argument from
Modified: branches/0.18/src/script/javascript.cpp
===================================================================
--- branches/0.18/src/script/javascript.cpp 2012-08-19 04:28:52 UTC (rev 4311)
+++ branches/0.18/src/script/javascript.cpp 2012-08-19 04:36:20 UTC (rev 4312)
@@ -2779,7 +2779,7 @@
float(rgb[2]))));
auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfcolor.get()));
sfcolor.release();
- if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; }
+ js_set_private(cx, obj, sfdata.get());
sfdata.release();
} catch (std::exception & ex) {
OPENVRML_PRINT_EXCEPTION_(ex);
@@ -2984,7 +2984,7 @@
std::auto_ptr<sfield::sfdata> sfdata(
new sfield::sfdata(sfimageClone.get()));
sfimageClone.release();
- if (!js_set_private(cx, sfimageObj, sfdata.get())) { return JS_FALSE; }
+ js_set_private(cx, sfimageObj, sfdata.get());
sfdata.release();
} catch (std::exception & ex) {
OPENVRML_PRINT_EXCEPTION_(ex);
@@ -3098,7 +3098,7 @@
openvrml::image(x, y, comp, pixels)));
auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfimage.get()));
sfimage.release();
- if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; }
+ js_set_private(cx, obj, sfdata.get());
sfdata.release();
} catch (std::bad_alloc &) {
JS_ReportOutOfMemory(cx);
@@ -3241,7 +3241,7 @@
auto_ptr<openvrml::sfnode> sfnodeClone(new openvrml::sfnode(node));
auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfnodeClone.get()));
sfnodeClone.release();
- if (!js_set_private(cx, sfnodeObj, sfdata.get())) { return JS_FALSE; }
+ js_set_private(cx, sfnodeObj, sfdata.get());
sfdata.release();
} catch (std::bad_alloc &) {
JS_ReportOutOfMemory(cx);
@@ -3335,7 +3335,7 @@
auto_ptr<openvrml::sfnode> sfnode(new openvrml::sfnode(nodes[0]));
auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfnode.get()));
sfnode.release();
- if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; }
+ js_set_private(cx, obj, sfdata.get());
sfdata.release();
} catch (std::bad_alloc &) {
JS_ReportOutOfMemory(cx);
@@ -3641,7 +3641,7 @@
float(rot[3]))));
auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfrotation.get()));
sfrotation.release();
- if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; }
+ js_set_private(cx, obj, sfdata.get());
sfdata.release();
} catch (std::exception & ex) {
OPENVRML_PRINT_EXCEPTION_(ex);
@@ -4116,7 +4116,7 @@
auto_ptr<sfvec2_t> sfvec2(new sfvec2_t(vec2));
auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfvec2.get()));
sfvec2.release();
- if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; }
+ js_set_private(cx, obj, sfdata.get());
sfdata.release();
} catch (std::bad_alloc &) {
JS_ReportOutOfMemory(cx);
@@ -4725,7 +4725,7 @@
auto_ptr<sfvec3_t> sfvec3(new sfvec3_t(vec3));
auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfvec3.get()));
sfvec3.release();
- if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; }
+ js_set_private(cx, obj, sfdata.get());
sfdata.release();
} catch (std::bad_alloc &) {
JS_ReportOutOfMemory(cx);
@@ -5379,7 +5379,7 @@
//
AddRoots(cx, mfdata->array);
- if (!js_set_private(cx, obj, mfdata.get())) { return JS_FALSE; }
+ js_set_private(cx, obj, mfdata.get());
mfdata.release();
} catch (std::bad_alloc &) {
JS_ReportOutOfMemory(cx);
@@ -5595,7 +5595,7 @@
}
}
- if (!js_set_private(cx, obj, mfdata.get())) { return JS_FALSE; }
+ js_set_private(cx, obj, mfdata.get());
//
// Protect array values from gc.
@@ -5857,7 +5857,7 @@
}
mfdata->array[i] = BOOLEAN_TO_JSVAL(boolean);
}
- if (!js_set_private(cx, obj, mfdata.get())) { return JS_FALSE; }
+ js_set_private(cx, obj, mfdata.get());
mfdata.release();
} catch (std::bad_alloc & ex) {
OPENVRML_PRINT_EXCEPTION_(ex);
@@ -6323,7 +6323,7 @@
return JS_FALSE;
}
}
- if (!js_set_private(cx, obj, mfdata.get())) { return JS_FALSE; }
+ js_set_private(cx, obj, mfdata.get());
mfdata.release();
} catch (std::bad_alloc & ex) {
OPENVRML_PRINT_EXCEPTION_(ex);
@@ -6487,7 +6487,7 @@
}
mfdata->array[i] = argv[i];
}
- if (!js_set_private(cx, obj, mfdata.get())) { return JS_FALSE; }
+ js_set_private(cx, obj, mfdata.get());
mfdata.release();
} catch (std::bad_alloc & ex) {
OPENVRML_PRINT_EXCEPTION_(ex);
@@ -6950,7 +6950,7 @@
//
AddRoots(cx, mfdata->array);
- if (!js_set_private(cx, obj, mfdata.get())) { return JS_FALSE; }
+ js_set_private(cx, obj, mfdata.get());
mfdata.release();
} catch (std::bad_alloc &) {
JS_ReportOutOfMemory(cx);
@@ -7658,7 +7658,7 @@
float(mat[4]), float(mat[5]), float(mat[6]), float(mat[7]),
float(mat[8]), float(mat[9]), float(mat[10]), float(mat[11]),
float(mat[12]), float(mat[13]), float(mat[14]), float(mat[15]))));
- if (!js_set_private(cx, obj, mat_ptr.get())) { return JS_FALSE; }
+ js_set_private(cx, obj, mat_ptr.get());
mat_ptr.release();
} catch (std::bad_alloc &) {
JS_ReportOutOfMemory(cx);
@@ -7688,7 +7688,7 @@
if (!robj) { return JS_FALSE; }
float (&row)[4] = (*thisMat)[jspropertyop_id_to_int(id)];
- if (!js_set_private(cx, robj, &row)) { return JS_FALSE; }
+ js_set_private(cx, robj, &row));
*vp = OBJECT_TO_JSVAL(robj);
}
return JS_TRUE;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
