Menu
▾
▴
SF.net SVN: openvrml:[4310] branches/0.18
|
From: <br...@us...> - 2012-08-19 02:01:32
|
Revision: 4310
http://openvrml.svn.sourceforge.net/openvrml/?rev=4310&view=rev
Author: braden
Date: 2012-08-19 02:01:23 +0000 (Sun, 19 Aug 2012)
Log Message:
-----------
XULRunner 14.0 removes the JSContext argument from JS_{Get,Set}Private.
Modified Paths:
--------------
branches/0.18/ChangeLog
branches/0.18/configure.ac
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
+ /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
Modified: branches/0.18/ChangeLog
===================================================================
--- branches/0.18/ChangeLog 2012-08-19 01:58:40 UTC (rev 4309)
+++ branches/0.18/ChangeLog 2012-08-19 02:01:23 UTC (rev 4310)
@@ -1,3 +1,11 @@
+2012-08-18 Braden McDaniel <br...@en...>
+
+ XULRunner 14.0 removes the JSContext argument from
+ JS_{Get,Set}Private.
+
+ * configure.ac
+ * src/script/javascript.cpp
+
2012-07-26 Braden McDaniel <br...@en...>
XULRunner 14.0 removes JS_FinalizeStub.
Modified: branches/0.18/configure.ac
===================================================================
--- branches/0.18/configure.ac 2012-08-19 01:58:40 UTC (rev 4309)
+++ branches/0.18/configure.ac 2012-08-19 02:01:23 UTC (rev 4310)
@@ -254,7 +254,7 @@
AC_LANG_PUSH([C++])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[[#include <jsapi.h>]],
-[[JSBool (*f)(JSContext *, uintN, jsval *); JSNative g = f;]])],
+[[JSBool (*f)(JSContext *, unsigned, jsval *); JSNative g = f;]])],
[ov_cv_fast_jsnative=yes])
AC_LANG_POP([C++])
CPPFLAGS=$ov_save_CPPFLAGS
@@ -312,8 +312,8 @@
ov_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$JS_CFLAGS $CPPFLAGS"
AC_LANG_ASSERT([C])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-[[#include <jsapi.h]],
+AC_LINK_IFELSE([AC_LANG_PROGRAM(
+[[#include <jsapi.h>]],
[[JS_FinalizeStub(0, 0)]])],
[ov_cv_js_has_finalizestub=yes])
CPPFLAGS=$ov_save_CPPFLAGS
@@ -323,6 +323,25 @@
[Defined if JS_FinalizeStub is declared in jsapi.h])])
#
+# XULRunner 14.0 removes the JSContext argument from JS_{Set,Get}Private.
+#
+AC_CACHE_CHECK([whether SpiderMonkey JS_SetPrivate is used without a JSContext],
+[ov_cv_js_private_without_context],
+[ov_cv_js_private_without_context=no
+ov_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$JS_CFLAGS $CPPFLAGS"
+AC_LANG_ASSERT([C])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+[[#include <jsapi.h>]],
+[[JS_SetPrivate(0, 0)]])],
+[ov_cv_js_private_without_context=yes])
+CPPFLAGS=$ov_save_CPPFLAGS
+])
+AS_IF([test X$ov_cv_js_private_without_context = Xyes],
+ [AC_DEFINE([OPENVRML_JS_PRIVATE_WITHOUT_CONTEXT], [1],
+ [Defined if JS_SetContext does not take a JSContext argument])])
+
+#
# openvrml-xembed and openvrml-player both use GOption, which was
# introduced in GLib 2.6.
#
Modified: branches/0.18/src/script/javascript.cpp
===================================================================
--- branches/0.18/src/script/javascript.cpp 2012-08-19 01:58:40 UTC (rev 4309)
+++ branches/0.18/src/script/javascript.cpp 2012-08-19 02:01:23 UTC (rev 4310)
@@ -143,7 +143,28 @@
# endif
}
+ OPENVRML_LOCAL
+ void * js_get_private(JSContext * const cx, JSObject * const obj)
+ {
+# ifdef OPENVRML_JS_PRIVATE_WITHOUT_CONTEXT
+ return JS_GetPrivate(obj);
+# else
+ return JS_GetPrivate(cx, obj);
+# endif
+ }
+ OPENVRML_LOCAL
+ void js_set_private(JSContext * const cx, JSObject * const obj,
+ void * const data)
+ {
+# ifdef OPENVRML_JS_PRIVATE_WITHOUT_CONTEXT
+ JS_SetPrivate(obj, data);
+# else
+ JS_SetPrivate(cx, obj, data);
+# endif
+ }
+
+
# ifdef OPENVRML_FAST_JSNATIVE
# define OPENVRML_DECLARE_JSNATIVE(name) \
JSBool (name)(JSContext * cx, unsigned argc, jsval * vp)
@@ -1258,7 +1279,7 @@
if (JSVAL_IS_OBJECT(val)) {
field_data * fieldData =
static_cast<field_data *>
- (JS_GetPrivate(this->cx, JSVAL_TO_OBJECT(val)));
+ (js_get_private(this->cx, JSVAL_TO_OBJECT(val)));
if (fieldData->changed) {
using std::auto_ptr;
auto_ptr<openvrml::field_value> fieldValue =
@@ -2600,16 +2621,16 @@
void sfield::finalize(JSContext * const cx, JSObject * const obj)
OPENVRML_NOTHROW
{
- delete static_cast<field_data *>(JS_GetPrivate(cx, obj));
- JS_SetPrivate(cx, obj, 0);
+ delete static_cast<field_data *>(js_get_private(cx, obj));
+ js_set_private(cx, obj, 0);
}
OPENVRML_DEFINE_MEMBER_JSNATIVE(sfield, toString)
{
- assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfield::sfdata & sfdata =
*static_cast<sfield::sfdata *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
std::ostringstream out;
out << sfdata.field_value();
@@ -2675,9 +2696,9 @@
JSObject * const sfcolorObj = js_construct_object(cx, &jsclass, 0, obj);
if (!sfcolorObj) { return JS_FALSE; }
- assert(JS_GetPrivate(cx, sfcolorObj));
+ assert(js_get_private(cx, sfcolorObj));
const sfield::sfdata & sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, sfcolorObj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, sfcolorObj));
try {
boost::polymorphic_downcast<openvrml::sfcolor *>(&sfdata.field_value())
@@ -2701,9 +2722,9 @@
if (!obj || !JS_InstanceOf(cx, obj, &SFColor::jsclass, 0)) {
throw bad_conversion("SFColor object expected.");
}
- assert(JS_GetPrivate(cx, obj));
+ assert(js_get_private(cx, obj));
const sfield::sfdata & sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, obj));
return auto_ptr<openvrml::sfcolor>(
boost::polymorphic_downcast<openvrml::sfcolor *>(
@@ -2758,7 +2779,7 @@
float(rgb[2]))));
auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfcolor.get()));
sfcolor.release();
- if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; }
+ if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; }
sfdata.release();
} catch (std::exception & ex) {
OPENVRML_PRINT_EXCEPTION_(ex);
@@ -2776,9 +2797,9 @@
jsval * const rval)
OPENVRML_NOTHROW
{
- assert(JS_GetPrivate(cx, obj));
+ assert(js_get_private(cx, obj));
const sfield::sfdata & sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, obj));
const openvrml::sfcolor & thisColor =
*boost::polymorphic_downcast<openvrml::sfcolor *>(
&sfdata.field_value());
@@ -2797,9 +2818,9 @@
OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(SFColor, setProperty)
{
- assert(JS_GetPrivate(cx, obj));
+ assert(js_get_private(cx, obj));
sfield::sfdata & sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, obj));
openvrml::sfcolor & thisColor =
*boost::polymorphic_downcast<openvrml::sfcolor *>(
&sfdata.field_value());
@@ -2843,10 +2864,10 @@
OPENVRML_DEFINE_MEMBER_JSNATIVE(SFColor, setHSV)
{
- assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
sfield::sfdata & sfdata =
*static_cast<sfield::sfdata *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
openvrml::sfcolor & thisColor =
*boost::polymorphic_downcast<openvrml::sfcolor *>(
&sfdata.field_value());
@@ -2880,10 +2901,10 @@
OPENVRML_DEFINE_MEMBER_JSNATIVE(SFColor, getHSV)
{
- assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfield::sfdata & sfdata =
*static_cast<sfield::sfdata *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const openvrml::sfcolor & thisColor =
*boost::polymorphic_downcast<openvrml::sfcolor *>(
&sfdata.field_value());
@@ -2963,7 +2984,7 @@
std::auto_ptr<sfield::sfdata> sfdata(
new sfield::sfdata(sfimageClone.get()));
sfimageClone.release();
- if (!JS_SetPrivate(cx, sfimageObj, sfdata.get())) { return JS_FALSE; }
+ if (!js_set_private(cx, sfimageObj, sfdata.get())) { return JS_FALSE; }
sfdata.release();
} catch (std::exception & ex) {
OPENVRML_PRINT_EXCEPTION_(ex);
@@ -2985,9 +3006,9 @@
if (!JS_InstanceOf(cx, obj, &SFImage::jsclass, 0)) {
throw bad_conversion("SFImage object expected.");
}
- assert(JS_GetPrivate(cx, obj));
+ assert(js_get_private(cx, obj));
const sfield::sfdata & sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, obj));
return auto_ptr<openvrml::sfimage>(
boost::polymorphic_downcast<openvrml::sfimage *>(
sfdata.field_value().clone().release()));
@@ -3051,7 +3072,7 @@
if (pixels_obj) {
assert(JS_InstanceOf(cx, pixels_obj, &MFInt32::jsclass, 0));
MField::MFData * const mfdata =
- static_cast<MField::MFData *>(JS_GetPrivate(cx, pixels_obj));
+ static_cast<MField::MFData *>(js_get_private(cx, pixels_obj));
pixels_t::iterator pixelPtr = pixels.begin();
for (MField::JsvalArray::size_type i(0);
@@ -3077,7 +3098,7 @@
openvrml::image(x, y, comp, pixels)));
auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfimage.get()));
sfimage.release();
- if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; }
+ if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; }
sfdata.release();
} catch (std::bad_alloc &) {
JS_ReportOutOfMemory(cx);
@@ -3098,9 +3119,9 @@
jsval * const vp)
OPENVRML_NOTHROW
{
- assert(JS_GetPrivate(cx, obj));
+ assert(js_get_private(cx, obj));
const sfield::sfdata & sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, obj));
const openvrml::sfimage & thisImage =
*boost::polymorphic_downcast<openvrml::sfimage *>(
&sfdata.field_value());
@@ -3220,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_SetPrivate(cx, sfnodeObj, sfdata.get())) { return JS_FALSE; }
+ if (!js_set_private(cx, sfnodeObj, sfdata.get())) { return JS_FALSE; }
sfdata.release();
} catch (std::bad_alloc &) {
JS_ReportOutOfMemory(cx);
@@ -3242,9 +3263,9 @@
if (!JS_InstanceOf(cx, obj, &sfnode_jsclass, 0)) {
throw bad_conversion("SFNode object expected.");
}
- assert(JS_GetPrivate(cx, obj));
+ assert(js_get_private(cx, obj));
const sfield::sfdata & sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, obj));
return auto_ptr<openvrml::sfnode>(
boost::polymorphic_downcast<openvrml::sfnode *>(
sfdata.field_value().clone().release()));
@@ -3314,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_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; }
+ if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; }
sfdata.release();
} catch (std::bad_alloc &) {
JS_ReportOutOfMemory(cx);
@@ -3334,9 +3355,9 @@
{
if (!jspropertyop_id_is_string(id)) { return JS_TRUE; }
- assert(JS_GetPrivate(cx, obj));
+ assert(js_get_private(cx, obj));
const sfield::sfdata & sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, obj));
const openvrml::sfnode & thisNode =
*boost::polymorphic_downcast<openvrml::sfnode *>(
&sfdata.field_value());
@@ -3365,9 +3386,9 @@
using std::auto_ptr;
using std::string;
- assert(JS_GetPrivate(cx, obj));
+ assert(js_get_private(cx, obj));
sfield::sfdata & sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, obj));
openvrml::sfnode & thisNode =
*boost::polymorphic_downcast<openvrml::sfnode *>(
&sfdata.field_value());
@@ -3474,9 +3495,9 @@
JSObject * const sfrotationObj = js_construct_object(cx, &jsclass, 0, obj);
if (!sfrotationObj) { return JS_FALSE; }
- assert(JS_GetPrivate(cx, sfrotationObj));
+ assert(js_get_private(cx, sfrotationObj));
const sfield::sfdata & sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, sfrotationObj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, sfrotationObj));
try {
boost::polymorphic_downcast<openvrml::sfrotation *>(
@@ -3500,9 +3521,9 @@
if (!JS_InstanceOf(cx, obj, &SFRotation::jsclass, 0)) {
throw bad_conversion("SFRotation object expected.");
}
- assert(JS_GetPrivate(cx, obj));
+ assert(js_get_private(cx, obj));
const sfield::sfdata & sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, obj));
return auto_ptr<openvrml::sfrotation>(
boost::polymorphic_downcast<openvrml::sfrotation *>(
sfdata.field_value().clone().release()));
@@ -3523,9 +3544,9 @@
OPENVRML_JS_ARGV(cx, vp))) {
return JS_FALSE;
}
- assert(JS_GetPrivate(cx, axis_obj));
+ assert(js_get_private(cx, axis_obj));
const sfield::sfdata & sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, axis_obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, axis_obj));
const openvrml::sfvec3f & axis =
*boost::polymorphic_downcast<openvrml::sfvec3f *>(
&sfdata.field_value());
@@ -3548,16 +3569,16 @@
return JS_FALSE;
}
- assert(JS_GetPrivate(cx, from_obj));
+ assert(js_get_private(cx, from_obj));
const sfield::sfdata & from_sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, from_obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, from_obj));
const openvrml::sfvec3f & from_vec =
*boost::polymorphic_downcast<openvrml::sfvec3f *>(
&from_sfdata.field_value());
- assert(JS_GetPrivate(cx, to_obj));
+ assert(js_get_private(cx, to_obj));
const sfield::sfdata & to_sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, to_obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, to_obj));
const openvrml::sfvec3f & to_vec =
*boost::polymorphic_downcast<openvrml::sfvec3f *>(
&to_sfdata.field_value());
@@ -3620,7 +3641,7 @@
float(rot[3]))));
auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfrotation.get()));
sfrotation.release();
- if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; }
+ if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; }
sfdata.release();
} catch (std::exception & ex) {
OPENVRML_PRINT_EXCEPTION_(ex);
@@ -3638,9 +3659,9 @@
jsval * const rval)
OPENVRML_NOTHROW
{
- assert(JS_GetPrivate(cx, obj));
+ assert(js_get_private(cx, obj));
const sfield::sfdata & sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, obj));
const openvrml::sfrotation & thisRot =
*boost::polymorphic_downcast<openvrml::sfrotation *>(
&sfdata.field_value());
@@ -3657,9 +3678,9 @@
OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(SFRotation, setProperty)
{
- assert(JS_GetPrivate(cx, obj));
+ assert(js_get_private(cx, obj));
sfield::sfdata & sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, obj));
openvrml::sfrotation & thisRot =
*boost::polymorphic_downcast<openvrml::sfrotation *>(
&sfdata.field_value());
@@ -3702,10 +3723,10 @@
OPENVRML_DEFINE_MEMBER_JSNATIVE(SFRotation, getAxis)
{
- assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfield::sfdata & obj_sfdata =
*static_cast<sfield::sfdata *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const openvrml::sfrotation & thisRot =
*boost::polymorphic_downcast<openvrml::sfrotation *>(
&obj_sfdata.field_value());
@@ -3715,9 +3736,9 @@
OPENVRML_JS_THIS_OBJECT(cx, vp));
if (!robj) { return JS_FALSE; }
- assert(JS_GetPrivate(cx, robj));
+ assert(js_get_private(cx, robj));
const sfield::sfdata & robj_sfdata =
- *static_cast<sfdata *>(JS_GetPrivate(cx, robj));
+ *static_cast<sfdata *>(js_get_private(cx, robj));
openvrml::sfvec3f & resultVec =
*boost::polymorphic_downcast<openvrml::sfvec3f *>(
&robj_sfdata.field_value());
@@ -3729,10 +3750,10 @@
OPENVRML_DEFINE_MEMBER_JSNATIVE(SFRotation, inverse)
{
- assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfield::sfdata & obj_sfdata =
*static_cast<sfield::sfdata *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const openvrml::sfrotation & thisRot =
*boost::polymorphic_downcast<openvrml::sfrotation *>(
&obj_sfdata.field_value());
@@ -3744,9 +3765,9 @@
js_construct_object(cx, &SFRotation::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
- assert(JS_GetPrivate(cx, robj));
+ assert(js_get_private(cx, robj));
const sfield::sfdata & robj_sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, robj));
openvrml::sfrotation & resultRot =
*boost::polymorphic_downcast<openvrml::sfrotation *>(
&robj_sfdata.field_value());
@@ -3758,10 +3779,10 @@
OPENVRML_DEFINE_MEMBER_JSNATIVE(SFRotation, multiply)
{
- assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfield::sfdata & obj_sfdata =
*static_cast<sfield::sfdata *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const openvrml::sfrotation & thisRot =
*boost::polymorphic_downcast<openvrml::sfrotation *>(
&obj_sfdata.field_value());
@@ -3776,9 +3797,9 @@
return JS_FALSE;
}
- assert(JS_GetPrivate(cx, rot_obj));
+ assert(js_get_private(cx, rot_obj));
const sfield::sfdata & arg_sfdata =
- *static_cast<sfdata *>(JS_GetPrivate(cx, rot_obj));
+ *static_cast<sfdata *>(js_get_private(cx, rot_obj));
const openvrml::sfrotation & argRot =
*boost::polymorphic_downcast<openvrml::sfrotation *>(
&arg_sfdata.field_value());
@@ -3793,9 +3814,9 @@
js_construct_object(cx, &SFRotation::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
- assert(JS_GetPrivate(cx, robj));
+ assert(js_get_private(cx, robj));
const sfield::sfdata & robj_sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, robj));
openvrml::sfrotation & resultRot =
*boost::polymorphic_downcast<openvrml::sfrotation *>(
&robj_sfdata.field_value());
@@ -3807,10 +3828,10 @@
OPENVRML_DEFINE_MEMBER_JSNATIVE(SFRotation, multVec)
{
- assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfield::sfdata & obj_sfdata =
*static_cast<sfdata *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const openvrml::sfrotation & thisRot =
*boost::polymorphic_downcast<openvrml::sfrotation *>(
&obj_sfdata.field_value());
@@ -3825,9 +3846,9 @@
return JS_FALSE;
}
- assert(JS_GetPrivate(cx, vec_obj));
+ assert(js_get_private(cx, vec_obj));
const sfield::sfdata & arg_sfdata =
- *static_cast<sfdata *>(JS_GetPrivate(cx, vec_obj));
+ *static_cast<sfdata *>(js_get_private(cx, vec_obj));
const openvrml::sfvec3f & argVec =
*boost::polymorphic_downcast<openvrml::sfvec3f *>(
&arg_sfdata.field_value());
@@ -3842,9 +3863,9 @@
js_construct_object(cx, &SFVec3f::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
- assert(JS_GetPrivate(cx, robj));
+ assert(js_get_private(cx, robj));
sfield::sfdata & robj_sfdata =
- *static_cast<sfdata *>(JS_GetPrivate(cx, robj));
+ *static_cast<sfdata *>(js_get_private(cx, robj));
openvrml::sfvec3f & resultVec =
*boost::polymorphic_downcast<openvrml::sfvec3f *>(
&robj_sfdata.field_value());
@@ -3858,10 +3879,10 @@
OPENVRML_DEFINE_MEMBER_JSNATIVE(SFRotation, setAxis)
{
- assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
sfield::sfdata & obj_sfdata =
*static_cast<sfield::sfdata *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
openvrml::sfrotation & thisRot =
*boost::polymorphic_downcast<openvrml::sfrotation *>(
&obj_sfdata.field_value());
@@ -3876,9 +3897,9 @@
return JS_FALSE;
}
- assert(JS_GetPrivate(cx, vec_obj));
+ assert(js_get_private(cx, vec_obj));
const sfield::sfdata & arg_sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, vec_obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, vec_obj));
const openvrml::sfvec3f & argVec =
*boost::polymorphic_downcast<openvrml::sfvec3f *>(
&arg_sfdata.field_value());
@@ -3898,10 +3919,10 @@
OPENVRML_DEFINE_MEMBER_JSNATIVE(SFRotation, slerp)
{
- assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfield::sfdata & obj_sfdata =
*static_cast<sfield::sfdata *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const openvrml::sfrotation & thisRot =
*boost::polymorphic_downcast<openvrml::sfrotation *>(
&obj_sfdata.field_value());
@@ -3917,9 +3938,9 @@
return JS_FALSE;
}
- assert(JS_GetPrivate(cx, dest_obj));
+ assert(js_get_private(cx, dest_obj));
const sfield::sfdata & dest_sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, dest_obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, dest_obj));
const openvrml::sfrotation & dest =
*boost::polymorphic_downcast<openvrml::sfrotation *>(
&dest_sfdata.field_value());
@@ -3934,9 +3955,9 @@
js_construct_object(cx, &SFRotation::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
- assert(JS_GetPrivate(cx, robj));
+ assert(js_get_private(cx, robj));
sfield::sfdata & robj_sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, robj));
openvrml::sfrotation & resultRot =
*boost::polymorphic_downcast<openvrml::sfrotation *>(
&robj_sfdata.field_value());
@@ -4011,9 +4032,9 @@
JSObject * const sfvec2Obj = js_construct_object(cx, &jsclass, 0, obj);
if (!sfvec2Obj) { return JS_FALSE; }
- assert(JS_GetPrivate(cx, sfvec2Obj));
+ assert(js_get_private(cx, sfvec2Obj));
const sfield::sfdata & sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, sfvec2Obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, sfvec2Obj));
try {
boost::polymorphic_downcast<field_type *>(&sfdata.field_value())
@@ -4036,9 +4057,9 @@
if (!JS_InstanceOf(cx, obj, &jsclass, 0)) {
throw bad_conversion("SFVec2f object expected.");
}
- assert(JS_GetPrivate(cx, obj));
+ assert(js_get_private(cx, obj));
const sfield::sfdata & sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, obj));
return auto_ptr<field_type>(boost::polymorphic_downcast<field_type *>(
sfdata.field_value().clone().release()));
}
@@ -4095,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_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; }
+ if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; }
sfdata.release();
} catch (std::bad_alloc &) {
JS_ReportOutOfMemory(cx);
@@ -4116,9 +4137,9 @@
if (jspropertyop_id_is_int(id)
&& jspropertyop_id_to_int(id) >= 0 && jspropertyop_id_to_int(id) < 2) {
- assert(JS_GetPrivate(cx, obj));
+ assert(js_get_private(cx, obj));
const sfield::sfdata & sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, obj));
const sfvec2_t & thisVec =
*boost::polymorphic_downcast<sfvec2_t *>(&sfdata.field_value());
@@ -4139,9 +4160,9 @@
if (jspropertyop_id_is_int(id)
&& jspropertyop_id_to_int(id) >= 0 && jspropertyop_id_to_int(id) < 2) {
- assert(JS_GetPrivate(cx, obj));
+ assert(js_get_private(cx, obj));
sfield::sfdata & sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, obj));
sfvec2_t & thisVec =
*boost::polymorphic_downcast<sfvec2_t *>(&sfdata.field_value());
@@ -4174,10 +4195,10 @@
{
typedef typename SFVec2::field_type sfvec2_t;
- assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfield::sfdata & obj_sfdata =
*static_cast<sfield::sfdata *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfvec2_t & thisVec =
*boost::polymorphic_downcast<sfvec2_t *>(&obj_sfdata.field_value());
@@ -4195,9 +4216,9 @@
return JS_FALSE;
}
- assert(JS_GetPrivate(cx, arg_obj));
+ assert(js_get_private(cx, arg_obj));
const sfield::sfdata & arg_sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, arg_obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, arg_obj));
const sfvec2_t & argVec =
*boost::polymorphic_downcast<sfvec2_t *>(&arg_sfdata.field_value());
@@ -4211,9 +4232,9 @@
js_construct_object(cx, &SFVec2::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
- assert(JS_GetPrivate(cx, robj));
+ assert(js_get_private(cx, robj));
sfield::sfdata & robj_sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, robj));
sfvec2_t & resultVec =
*boost::polymorphic_downcast<sfvec2_t *>(&robj_sfdata.field_value());
@@ -4228,10 +4249,10 @@
{
typedef typename SFVec2::field_type sfvec2_t;
- assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfield::sfdata & obj_sfdata =
*static_cast<sfield::sfdata *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfvec2_t & thisVec =
*boost::polymorphic_downcast<sfvec2_t *>(&obj_sfdata.field_value());
@@ -4254,9 +4275,9 @@
js_construct_object(cx, &SFVec2::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
- assert(JS_GetPrivate(cx, robj));
+ assert(js_get_private(cx, robj));
sfield::sfdata & robj_sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, robj));
sfvec2_t & resultVec =
*boost::polymorphic_downcast<sfvec2_t *>(&robj_sfdata.field_value());
@@ -4271,10 +4292,10 @@
{
typedef typename SFVec2::field_type sfvec2_t;
- assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfield::sfdata & sfdata =
*static_cast<sfield::sfdata *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfvec2_t & thisVec =
*boost::polymorphic_downcast<sfvec2_t *>(&sfdata.field_value());
@@ -4292,9 +4313,9 @@
return JS_FALSE;
}
- assert(JS_GetPrivate(cx, arg_obj));
+ assert(js_get_private(cx, arg_obj));
const sfield::sfdata & arg_sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, arg_obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, arg_obj));
const sfvec2_t & argVec =
*boost::polymorphic_downcast<sfvec2_t *>(&arg_sfdata.field_value());
@@ -4310,10 +4331,10 @@
{
typedef typename SFVec2::field_type sfvec2_t;
- assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfield::sfdata & sfdata =
*static_cast<sfield::sfdata *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfvec2_t & thisVec =
*boost::polymorphic_downcast<sfvec2_t *>(&sfdata.field_value());
@@ -4329,10 +4350,10 @@
{
typedef typename SFVec2::field_type sfvec2_t;
- assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfield::sfdata & obj_sfdata =
*static_cast<sfield::sfdata *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfvec2_t & thisVec =
*boost::polymorphic_downcast<sfvec2_t *>(&obj_sfdata.field_value());
@@ -4355,9 +4376,9 @@
js_construct_object(cx, &SFVec2::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
- assert(JS_GetPrivate(cx, robj));
+ assert(js_get_private(cx, robj));
sfield::sfdata & robj_sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, robj));
sfvec2_t & resultVec =
*boost::polymorphic_downcast<sfvec2_t *>(&robj_sfdata.field_value());
@@ -4372,10 +4393,10 @@
{
typedef typename SFVec2::field_type sfvec2_t;
- assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfield::sfdata & obj_sfdata =
*static_cast<sfield::sfdata *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfvec2_t & thisVec =
*boost::polymorphic_downcast<sfvec2_t *>(&obj_sfdata.field_value());
@@ -4389,9 +4410,9 @@
js_construct_object(cx, &SFVec2::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
- assert(JS_GetPrivate(cx, robj));
+ assert(js_get_private(cx, robj));
sfield::sfdata & robj_sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, robj));
sfvec2_t & resultVec =
*boost::polymorphic_downcast<sfvec2_t *>(&robj_sfdata.field_value());
@@ -4406,10 +4427,10 @@
{
typedef typename SFVec2::field_type sfvec2_t;
- assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfield::sfdata & obj_sfdata =
*static_cast<sfield::sfdata *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfvec2_t & thisVec =
*boost::polymorphic_downcast<sfvec2_t *>(&obj_sfdata.field_value());
@@ -4423,9 +4444,9 @@
js_construct_object(cx, &SFVec2::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
- assert(JS_GetPrivate(cx, robj));
+ assert(js_get_private(cx, robj));
sfield::sfdata & robj_sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, robj));
sfvec2_t & resultVec =
*boost::polymorphic_downcast<sfvec2_t *>(&robj_sfdata.field_value());
@@ -4440,10 +4461,10 @@
{
typedef typename SFVec2::field_type sfvec2_t;
- assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfield::sfdata & obj_sfdata =
*static_cast<sfield::sfdata *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfvec2_t & thisVec =
*boost::polymorphic_downcast<sfvec2_t *>(&obj_sfdata.field_value());
@@ -4461,9 +4482,9 @@
return JS_FALSE;
}
- assert(JS_GetPrivate(cx, arg_obj));
+ assert(js_get_private(cx, arg_obj));
const sfield::sfdata & arg_sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, arg_obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, arg_obj));
const sfvec2_t & argVec =
*boost::polymorphic_downcast<sfvec2_t *>(&arg_sfdata.field_value());
@@ -4477,9 +4498,9 @@
js_construct_object(cx, &SFVec2::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
- assert(JS_GetPrivate(cx, robj));
+ assert(js_get_private(cx, robj));
sfield::sfdata & robj_sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, robj));
sfvec2_t & resultVec =
*boost::polymorphic_downcast<sfvec2_t *>(&robj_sfdata.field_value());
@@ -4519,9 +4540,9 @@
JSObject * const sfvec2dObj = js_construct_object(cx, &jsclass, 0, obj);
if (!sfvec2dObj) { return JS_FALSE; }
- assert(JS_GetPrivate(cx, sfvec2dObj));
+ assert(js_get_private(cx, sfvec2dObj));
const sfield::sfdata & sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, sfvec2dObj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, sfvec2dObj));
try {
boost::polymorphic_downcast<openvrml::sfvec2d *>(
@@ -4544,9 +4565,9 @@
if (!JS_InstanceOf(cx, obj, &SFVec2d::jsclass, 0)) {
throw bad_conversion("SFVec2d object expected");
}
- assert(JS_GetPrivate(cx, obj));
+ assert(js_get_private(cx, obj));
const sfield::sfdata & sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, obj));
return auto_ptr<openvrml::sfvec2d>(
boost::polymorphic_downcast<openvrml::sfvec2d *>(
sfdata.field_value().clone().release()));
@@ -4618,9 +4639,9 @@
JSObject * const sfvec3fObj = js_construct_object(cx, &jsclass, 0, obj);
if (!sfvec3fObj) { return JS_FALSE; }
- assert(JS_GetPrivate(cx, sfvec3fObj));
+ assert(js_get_private(cx, sfvec3fObj));
const sfield::sfdata & sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, sfvec3fObj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, sfvec3fObj));
try {
boost::polymorphic_downcast<openvrml::sfvec3f *>(
@@ -4643,9 +4664,9 @@
if (!JS_InstanceOf(cx, obj, &SFVec3f::jsclass, 0)) {
throw bad_conversion("SFVec3f object expected.");
}
- assert(JS_GetPrivate(cx, obj));
+ assert(js_get_private(cx, obj));
const sfield::sfdata & sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, obj));
return auto_ptr<openvrml::sfvec3f>(
boost::polymorphic_downcast<openvrml::sfvec3f *>(
sfdata.field_value().clone().release()));
@@ -4704,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_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; }
+ if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; }
sfdata.release();
} catch (std::bad_alloc &) {
JS_ReportOutOfMemory(cx);
@@ -4724,9 +4745,9 @@
if (jspropertyop_id_is_int(id)
&& jspropertyop_id_to_int(id) >= 0 && jspropertyop_id_to_int(id) < 3) {
- assert(JS_GetPrivate(cx, obj));
+ assert(js_get_private(cx, obj));
const sfield::sfdata & sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, obj));
const sfvec3_t & thisVec =
*boost::polymorphic_downcast<sfvec3_t *>(&sfdata.field_value());
@@ -4747,9 +4768,9 @@
if (jspropertyop_id_is_int(id)
&& jspropertyop_id_to_int(id) >= 0 && jspropertyop_id_to_int(id) < 3) {
- assert(JS_GetPrivate(cx, obj));
+ assert(js_get_private(cx, obj));
sfield::sfdata & sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, obj));
sfvec3_t & thisVec =
*boost::polymorphic_downcast<sfvec3_t *>(&sfdata.field_value());
@@ -4785,10 +4806,10 @@
{
typedef typename SFVec3::field_type sfvec3_t;
- assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfield::sfdata & obj_sfdata =
*static_cast<sfield::sfdata *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfvec3_t & thisVec =
*boost::polymorphic_downcast<sfvec3_t *>(&obj_sfdata.field_value());
@@ -4806,9 +4827,9 @@
return JS_FALSE;
}
- assert(JS_GetPrivate(cx, arg_obj));
+ assert(js_get_private(cx, arg_obj));
const sfield::sfdata & arg_sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, arg_obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, arg_obj));
const sfvec3_t & argVec =
*boost::polymorphic_downcast<sfvec3_t *>(&arg_sfdata.field_value());
@@ -4822,9 +4843,9 @@
js_construct_object(cx, &SFVec3::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
- assert(JS_GetPrivate(cx, robj));
+ assert(js_get_private(cx, robj));
sfield::sfdata & robj_sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, robj));
sfvec3_t & resultVec =
*boost::polymorphic_downcast<sfvec3_t *>(&robj_sfdata.field_value());
@@ -4839,10 +4860,10 @@
{
typedef typename SFVec3::field_type sfvec3_t;
- assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfield::sfdata & obj_sfdata =
*static_cast<sfield::sfdata *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfvec3_t & thisVec =
*boost::polymorphic_downcast<sfvec3_t *>(&obj_sfdata.field_value());
@@ -4860,9 +4881,9 @@
return JS_FALSE;
}
- assert(JS_GetPrivate(cx, arg_obj));
+ assert(js_get_private(cx, arg_obj));
const sfield::sfdata & arg_sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, arg_obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, arg_obj));
const sfvec3_t & argVec =
*boost::polymorphic_downcast<sfvec3_t *>(&arg_sfdata.field_value());
@@ -4876,9 +4897,9 @@
js_construct_object(cx, &SFVec3::jsclass, proto, parent);
if (!robj) {return JS_FALSE; }
- assert(JS_GetPrivate(cx, robj));
+ assert(js_get_private(cx, robj));
sfield::sfdata & robj_sfdata =
- *static_cast<sfdata *>(JS_GetPrivate(cx, robj));
+ *static_cast<sfdata *>(js_get_private(cx, robj));
sfvec3_t & resultVec =
*boost::polymorphic_downcast<sfvec3_t *>(&robj_sfdata.field_value());
@@ -4893,10 +4914,10 @@
{
typedef typename SFVec3::field_type sfvec3_t;
- assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfield::sfdata & obj_sfdata =
*static_cast<sfield::sfdata *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfvec3_t & thisVec =
*boost::polymorphic_downcast<sfvec3_t *>(&obj_sfdata.field_value());
@@ -4919,9 +4940,9 @@
js_construct_object(cx, &SFVec3::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
- assert(JS_GetPrivate(cx, robj));
+ assert(js_get_private(cx, robj));
sfield::sfdata & robj_sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, robj));
sfvec3_t & resultVec =
*boost::polymorphic_downcast<sfvec3_t *>(&robj_sfdata.field_value());
@@ -4936,10 +4957,10 @@
{
typedef typename SFVec3::field_type sfvec3_t;
- assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfield::sfdata & obj_sfdata =
*static_cast<sfield::sfdata *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfvec3_t & thisVec =
*boost::polymorphic_downcast<sfvec3_t *>(&obj_sfdata.field_value());
@@ -4957,9 +4978,9 @@
return JS_FALSE;
}
- assert(JS_GetPrivate(cx, arg_obj));
+ assert(js_get_private(cx, arg_obj));
const sfield::sfdata & arg_sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, arg_obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, arg_obj));
const sfvec3_t & argVec =
*boost::polymorphic_downcast<sfvec3_t *>(&arg_sfdata.field_value());
@@ -4975,10 +4996,10 @@
{
typedef typename SFVec3::field_type sfvec3_t;
- assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfield::sfdata & sfdata =
*static_cast<sfield::sfdata *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfvec3_t & thisVec =
*boost::polymorphic_downcast<sfvec3_t *>(&sfdata.field_value());
@@ -4994,10 +5015,10 @@
{
typedef typename SFVec3::field_type sfvec3_t;
- assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfield::sfdata & obj_sfdata =
*static_cast<sfield::sfdata *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfvec3_t & thisVec =
*boost::polymorphic_downcast<sfvec3_t *>(&obj_sfdata.field_value());
@@ -5020,9 +5041,9 @@
js_construct_object(cx, &SFVec3::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
- assert(JS_GetPrivate(cx, robj));
+ assert(js_get_private(cx, robj));
const sfield::sfdata & arg_sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, robj));
sfvec3_t & resultVec =
*boost::polymorphic_downcast<sfvec3_t *>(&arg_sfdata.field_value());
@@ -5037,10 +5058,10 @@
{
typedef typename SFVec3::field_type sfvec3_t;
- assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfield::sfdata & obj_sfdata =
*static_cast<sfield::sfdata *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfvec3_t & thisVec =
*boost::polymorphic_downcast<sfvec3_t *>(&obj_sfdata.field_value());
@@ -5054,9 +5075,9 @@
js_construct_object(cx, &SFVec3::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
- assert(JS_GetPrivate(cx, robj));
+ assert(js_get_private(cx, robj));
const sfield::sfdata & robj_sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, robj));
sfvec3_t & resultVec =
*boost::polymorphic_downcast<sfvec3_t *>(&robj_sfdata.field_value());
@@ -5071,10 +5092,10 @@
{
typedef typename SFVec3::field_type sfvec3_t;
- assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfield::sfdata & obj_sfdata =
*static_cast<sfield::sfdata *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfvec3_t & thisVec =
*boost::polymorphic_downcast<sfvec3_t *>(&obj_sfdata.field_value());
@@ -5088,9 +5109,9 @@
js_construct_object(cx, &SFVec3::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
- assert(JS_GetPrivate(cx, robj));
+ assert(js_get_private(cx, robj));
sfield::sfdata & robj_sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, robj));
sfvec3_t & resultVec =
*boost::polymorphic_downcast<sfvec3_t *>(&robj_sfdata.field_value());
@@ -5105,10 +5126,10 @@
{
typedef typename SFVec3::field_type sfvec3_t;
- assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfield::sfdata & obj_sfdata =
*static_cast<sfield::sfdata *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
const sfvec3_t & thisVec =
*boost::polymorphic_downcast<sfvec3_t *>(&obj_sfdata.field_value());
@@ -5126,9 +5147,9 @@
return JS_FALSE;
}
- assert(JS_GetPrivate(cx, arg_obj));
+ assert(js_get_private(cx, arg_obj));
const sfield::sfdata & arg_sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, arg_obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, arg_obj));
const sfvec3_t & argVec =
*boost::polymorphic_downcast<sfvec3_t *>(&arg_sfdata.field_value());
@@ -5142,9 +5163,9 @@
js_construct_object(cx, &SFVec3::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
- assert(JS_GetPrivate(cx, robj));
+ assert(js_get_private(cx, robj));
sfield::sfdata & robj_sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, robj));
sfvec3_t & resultVec =
*boost::polymorphic_downcast<sfvec3_t *>(&robj_sfdata.field_value());
@@ -5183,9 +5204,9 @@
JSObject * const sfvec3dObj = js_construct_object(cx, &jsclass, 0, obj);
if (!sfvec3dObj) { return JS_FALSE; }
- assert(JS_GetPrivate(cx, sfvec3dObj));
+ assert(js_get_private(cx, sfvec3dObj));
const sfield::sfdata & sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, sfvec3dObj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, sfvec3dObj));
try {
boost::polymorphic_downcast<openvrml::sfvec3d *>(
@@ -5208,9 +5229,9 @@
if (!JS_InstanceOf(cx, obj, &SFVec3d::jsclass, 0)) {
throw bad_conversion("SFVec3d object expected");
}
- assert(JS_GetPrivate(cx, obj));
+ assert(js_get_private(cx, obj));
const sfield::sfdata & sfdata =
- *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj));
+ *static_cast<sfield::sfdata *>(js_get_private(cx, obj));
return auto_ptr<openvrml::sfvec3d>(
boost::polymorphic_downcast<openvrml::sfvec3d *>(
sfdata.field_value().clone().release()));
@@ -5258,7 +5279,7 @@
assert(cx);
assert(obj);
assert(vp);
- MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj));
+ MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj));
assert(mfdata);
if (jspropertyop_id_is_int(id)
@@ -5279,7 +5300,7 @@
assert(obj);
assert(vp);
const MFData * const mfdata =
- static_cast<MFData *>(JS_GetPrivate(cx, obj));
+ static_cast<MFData *>(js_get_private(cx, obj));
assert(mfdata);
*vp = INT_TO_JSVAL(mfdata->array.size());
@@ -5358,7 +5379,7 @@
//
AddRoots(cx, mfdata->array);
- if (!JS_SetPrivate(cx, obj, mfdata.get())) { return JS_FALSE; }
+ if (!js_set_private(cx, obj, mfdata.get())) { return JS_FALSE; }
mfdata.release();
} catch (std::bad_alloc &) {
JS_ReportOutOfMemory(cx);
@@ -5375,7 +5396,7 @@
assert(vp);
if (jspropertyop_id_is_int(id) && jspropertyop_id_to_int(id) > 0) {
- MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj));
+ MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj));
assert(mfdata);
//
@@ -5417,7 +5438,7 @@
assert(obj);
assert(vp);
- MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj));
+ MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj));
assert(mfdata);
uint32_t new_length;
@@ -5478,7 +5499,7 @@
{
MFData * const mfdata =
static_cast<MFData *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
assert(mfdata);
std::ostringstream out;
@@ -5487,7 +5508,7 @@
assert(JSVAL_IS_OBJECT(mfdata->array[i]));
const sfield::sfdata * const sfdata =
static_cast<sfield::sfdata *>
- (JS_GetPrivate(cx, JSVAL_TO_OBJECT(mfdata->array[i])));
+ (js_get_private(cx, JSVAL_TO_OBJECT(mfdata->array[i])));
assert(sfdata);
out << sfdata->field_value();
if ((i + 1) < mfdata->array.size()) { out << ", "; }
@@ -5506,11 +5527,11 @@
{
assert(cx);
assert(obj);
- MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj));
+ MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj));
if (mfdata) {
RemoveRoots(cx, mfdata->array);
delete mfdata;
- JS_SetPrivate(cx, obj, 0);
+ js_set_private(cx, obj, 0);
}
}
@@ -5574,7 +5595,7 @@
}
}
- if (!JS_SetPrivate(cx, obj, mfdata.get())) { return JS_FALSE; }
+ if (!js_set_private(cx, obj, mfdata.get())) { return JS_FALSE; }
//
// Protect array values from gc.
@@ -5594,7 +5615,7 @@
OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(MFJSDouble<Subclass>, setElement)
{
if (jspropertyop_id_is_int(id) && jspropertyop_id_to_int(id) >= 0) {
- MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj));
+ MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj));
assert(mfdata);
//
@@ -5635,7 +5656,7 @@
assert(obj);
assert(vp);
- MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj));
+ MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj));
assert(mfdata);
uint32_t new_length;
@@ -5695,7 +5716,7 @@
{
MFData * const mfdata =
static_cast<MFData *>(
- JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)));
assert(mfdata);
std::ostringstream out;
@@ -5717,11 +5738,11 @@
void MFJSDouble<Subclass>::finalize(JSContext * const cx, JSObject * const obj)
OPENVRML_NOTHROW
{
- MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj));
+ MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj));
if (mfdat...
[truncated message content] |
