Menu
▾
▴
SF.net SVN: openvrml:[4305] branches/0.18
|
From: <br...@us...> - 2012-07-26 06:38:27
|
Revision: 4305
http://openvrml.svn.sourceforge.net/openvrml/?rev=4305&view=rev
Author: braden
Date: 2012-07-26 06:38:18 +0000 (Thu, 26 Jul 2012)
Log Message:
-----------
JS_RemoveValueRoot no longer returns a value; simply change the existing wrapper to return void. Should be backward compatible (since we could never do anything useful with failure here).
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
+ /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
Modified: branches/0.18/ChangeLog
===================================================================
--- branches/0.18/ChangeLog 2012-07-26 06:35:34 UTC (rev 4304)
+++ branches/0.18/ChangeLog 2012-07-26 06:38:18 UTC (rev 4305)
@@ -1,5 +1,12 @@
2012-07-26 Braden McDaniel <br...@en...>
+ * src/script/javascript.cpp: JS_RemoveValueRoot no longer returns
+ a value; simply change the existing wrapper to return void.
+ Should be backward compatible (since we could never do anything
+ useful with failure here).
+
+2012-07-26 Braden McDaniel <br...@en...>
+
* src/script/javascript.cpp: Remove uses of jsdouble and uintN.
Current XULRunner nolonger defines these; and this should be
reasonably backward-compatible.
Modified: branches/0.18/src/script/javascript.cpp
===================================================================
--- branches/0.18/src/script/javascript.cpp 2012-07-26 06:35:34 UTC (rev 4304)
+++ branches/0.18/src/script/javascript.cpp 2012-07-26 06:38:18 UTC (rev 4305)
@@ -91,13 +91,13 @@
# endif
}
- OPENVRML_LOCAL JSBool remove_value_root(JSContext * const cx,
- jsval * const vp)
+ OPENVRML_LOCAL void remove_value_root(JSContext * const cx,
+ jsval * const vp)
{
# ifdef OPENVRML_JS_HAS_TYPED_ROOT_FUNCTIONS
- return JS_RemoveValueRoot(cx, vp);
+ JS_RemoveValueRoot(cx, vp);
# else
- return JS_RemoveRoot(cx, vp);
+ JS_RemoveRoot(cx, vp);
# endif
}
@@ -1229,8 +1229,7 @@
for (i = 0; i < argc; ++i) {
assert(jsargv[i] != JSVAL_NULL);
if (JSVAL_IS_GCTHING(jsargv[i])) {
- ok = remove_value_root(cx, &jsargv[i]);
- assert(ok);
+ remove_value_root(cx, &jsargv[i]);
}
}
@@ -5238,8 +5237,7 @@
OPENVRML_NOTHROW
{
for (size_t i = 0; i < jsvalArray.size(); ++i) {
- const JSBool ok = remove_value_root(cx, &jsvalArray[i]);
- assert(ok);
+ remove_value_root(cx, &jsvalArray[i]);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
