SF.net SVN: openvrml:[4194] trunk

[<br...@us...>]

Revision: 4194
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4194&view=rev
Author:   braden
Date:     2010-09-15 16:46:30 +0000 (Wed, 15 Sep 2010)

Log Message:
-----------
JS_NewDouble is deprecated; use JS_NewNumberValue instead.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/script/javascript.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-09-15 06:58:25 UTC (rev 4193)
+++ trunk/ChangeLog	2010-09-15 16:46:30 UTC (rev 4194)
@@ -1,5 +1,10 @@
 2010-09-15 Braden McDaniel  <br...@en...>
 
+	* src/script/javascript.cpp: JS_NewDouble is deprecated; use
+	JS_NewNumberValue instead.
+
+2010-09-15 Braden McDaniel  <br...@en...>
+
 	* src/script/javascript.cpp: JS_NewDoubleValue is deprecated; use
 	JS_NewNumberValue instead.
 

Modified: trunk/src/script/javascript.cpp
===================================================================
--- trunk/src/script/javascript.cpp	2010-09-15 06:58:25 UTC (rev 4193)
+++ trunk/src/script/javascript.cpp	2010-09-15 16:46:30 UTC (rev 4194)
@@ -2210,14 +2210,12 @@
                                uintN, jsval *, jsval * const rval)
             OPENVRML_NOTHROW
         {
-            script * const s =
-                static_cast<script *>(JS_GetContextPrivate(cx));
+            script * const s = static_cast<script *>(JS_GetContextPrivate(cx));
             assert(s);
 
-            float speed = s->script_node().node::type().metatype()
-                .browser().current_speed();
-            *rval = DOUBLE_TO_JSVAL(JS_NewDouble( cx, speed ));
-            return JS_TRUE;
+            const jsdouble speed =
+                s->script_node().type().metatype().browser().current_speed();
+            return JS_NewNumberValue(cx, speed, rval);
         }
 
         JSBool getCurrentFrameRate(JSContext * const cx,
@@ -2230,11 +2228,9 @@
             script * const s = static_cast<script *>(JS_GetContextPrivate(cx));
             assert(s);
 
-            jsdouble * d = JS_NewDouble(cx,
-                                        s->script_node().node::type().metatype()
-                                        .browser().frame_rate());
-            *rval = DOUBLE_TO_JSVAL(d);
-            return JS_TRUE;
+            const jsdouble frame_rate =
+                s->script_node().type().metatype().browser().frame_rate();
+            return JS_NewNumberValue(cx, frame_rate, rval);
         }
 
         JSBool getWorldURL(JSContext * const cx,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.