From: <br...@us...> - 2010-09-15 06:55:25
|
Revision: 4192 http://openvrml.svn.sourceforge.net/openvrml/?rev=4192&view=rev Author: braden Date: 2010-09-15 06:55:19 +0000 (Wed, 15 Sep 2010) Log Message: ----------- JS_NewDoubleValue is deprecated; use JS_NewNumberValue instead. Modified Paths: -------------- trunk/ChangeLog trunk/src/script/javascript.cpp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-09-14 06:23:40 UTC (rev 4191) +++ trunk/ChangeLog 2010-09-15 06:55:19 UTC (rev 4192) @@ -1,3 +1,8 @@ +2010-09-15 Braden McDaniel <br...@en...> + + * src/script/javascript.cpp: JS_NewDoubleValue is deprecated; use + JS_NewNumberValue instead. + 2010-09-14 Braden McDaniel <br...@en...> * data/component/shape.xml: Added missing descriptions of Modified: trunk/src/script/javascript.cpp =================================================================== --- trunk/src/script/javascript.cpp 2010-09-14 06:23:40 UTC (rev 4191) +++ trunk/src/script/javascript.cpp 2010-09-15 06:55:19 UTC (rev 4192) @@ -1329,7 +1329,7 @@ using openvrml::sffloat; const sffloat & f = *polymorphic_downcast<const sffloat *>(&fieldValue); - if (!JS_NewDoubleValue(cx, f.value(), &rval)) { + if (!JS_NewNumberValue(cx, f.value(), &rval)) { rval = JSVAL_NULL; } } @@ -1340,7 +1340,7 @@ using openvrml::sfdouble; const sfdouble & f = *polymorphic_downcast<const sfdouble *>(&fieldValue); - if (!JS_NewDoubleValue(cx, f.value(), &rval)) { + if (!JS_NewNumberValue(cx, f.value(), &rval)) { rval = JSVAL_NULL; } } @@ -1401,7 +1401,7 @@ { const openvrml::sftime & sftime = *polymorphic_downcast<const openvrml::sftime *>(&fieldValue); - if (!JS_NewDoubleValue(cx, sftime.value(), &rval)) { + if (!JS_NewNumberValue(cx, sftime.value(), &rval)) { rval = JSVAL_NULL; } } @@ -1955,7 +1955,7 @@ size_t i; for (i = 0; i < numFloats; ++i) { - if (!JS_NewDoubleValue(cx, floats[i], &jsvec[i])) { + if (!JS_NewNumberValue(cx, floats[i], &jsvec[i])) { return JS_FALSE; } if (!JS_AddRoot(cx, &jsvec[i])) { return JS_FALSE; } @@ -2821,7 +2821,7 @@ if (JSVAL_IS_INT(id) && JSVAL_TO_INT(id) >= 0 && JSVAL_TO_INT(id) < 3) { - if (!JS_NewDoubleValue(cx, thisColor.value()[JSVAL_TO_INT(id)], rval)) + if (!JS_NewNumberValue(cx, thisColor.value()[JSVAL_TO_INT(id)], rval)) { return JS_FALSE; } @@ -3679,7 +3679,7 @@ if (JSVAL_IS_INT(id) && JSVAL_TO_INT(id) >= 0 && JSVAL_TO_INT(id) < 4) { - if (!JS_NewDoubleValue(cx, thisRot.value()[JSVAL_TO_INT(id)], rval)) { + if (!JS_NewNumberValue(cx, thisRot.value()[JSVAL_TO_INT(id)], rval)) { return JS_FALSE; } } @@ -4162,7 +4162,7 @@ const sfvec2_t & thisVec = *boost::polymorphic_downcast<sfvec2_t *>(&sfdata.field_value()); - if (!JS_NewDoubleValue(cx, thisVec.value()[JSVAL_TO_INT(id)], rval)) { + if (!JS_NewNumberValue(cx, thisVec.value()[JSVAL_TO_INT(id)], rval)) { return JS_FALSE; } } @@ -4345,7 +4345,7 @@ *boost::polymorphic_downcast<sfvec2_t *>(&arg_sfdata.field_value()); const jsdouble result = thisVec.value().dot(argVec.value()); - if (!JS_NewDoubleValue(cx, result, rval)) { return JS_FALSE; } + if (!JS_NewNumberValue(cx, result, rval)) { return JS_FALSE; } return JS_TRUE; } @@ -4365,7 +4365,7 @@ const sfvec2_t & thisVec = *boost::polymorphic_downcast<sfvec2_t *>(&sfdata.field_value()); - if (!JS_NewDoubleValue(cx, thisVec.value().length(), rval)) { + if (!JS_NewNumberValue(cx, thisVec.value().length(), rval)) { return JS_FALSE; } return JS_TRUE; @@ -4781,7 +4781,7 @@ const sfvec3_t & thisVec = *boost::polymorphic_downcast<sfvec3_t *>(&sfdata.field_value()); - if (!JS_NewDoubleValue(cx, thisVec.value()[JSVAL_TO_INT(id)], vp)) { + if (!JS_NewNumberValue(cx, thisVec.value()[JSVAL_TO_INT(id)], vp)) { return JS_FALSE; } } @@ -5022,7 +5022,7 @@ *boost::polymorphic_downcast<sfvec3_t *>(&arg_sfdata.field_value()); const jsdouble result = thisVec.value().dot(argVec.value()); - if (!JS_NewDoubleValue(cx, result, rval)) { return JS_FALSE; } + if (!JS_NewNumberValue(cx, result, rval)) { return JS_FALSE; } return JS_TRUE; } @@ -5042,7 +5042,7 @@ const sfvec3_t & thisVec = *boost::polymorphic_downcast<sfvec3_t *>(&sfdata.field_value()); - if (!JS_NewDoubleValue(cx, thisVec.value().length(), rval)) { + if (!JS_NewNumberValue(cx, thisVec.value().length(), rval)) { return JS_FALSE; } return JS_TRUE; @@ -5747,7 +5747,7 @@ // try { for (size_t i = length; i < newArray.size(); ++i) { - if (!JS_NewDoubleValue(cx, 0.0, &newArray[i])) { + if (!JS_NewNumberValue(cx, 0.0, &newArray[i])) { throw std::bad_alloc(); } } @@ -6140,7 +6140,7 @@ MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, mffloatObj)); for (size_t i = 0; i < floats.size(); ++i) { - if (!JS_NewDoubleValue(cx, floats[i], &mfdata->array[i])) { + if (!JS_NewNumberValue(cx, floats[i], &mfdata->array[i])) { return JS_FALSE; } } @@ -6212,7 +6212,7 @@ MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, mfdoubleObj)); for (size_t i = 0; i < doubles.size(); ++i) { - if (!JS_NewDoubleValue(cx, doubles[i], &mfdata->array[i])) { + if (!JS_NewNumberValue(cx, doubles[i], &mfdata->array[i])) { return JS_FALSE; } } @@ -7189,7 +7189,7 @@ MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, mftimeObj)); for (size_t i = 0; i < times.size(); ++i) { - if (!JS_NewDoubleValue(cx, times[i], &mfdata->array[i])) { + if (!JS_NewNumberValue(cx, times[i], &mfdata->array[i])) { return JS_FALSE; } } @@ -7599,7 +7599,7 @@ const float (&row)[4] = *static_cast<float (*)[4]>(JS_GetPrivate(cx, obj)); - if (!JS_NewDoubleValue(cx, row[JSVAL_TO_INT(id)], vp)) { + if (!JS_NewNumberValue(cx, row[JSVAL_TO_INT(id)], vp)) { return JS_FALSE; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |