SF.net SVN: openvrml:[4304] trunk

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

Revision: 4304
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4304&view=rev
Author:   braden
Date:     2012-07-26 06:35:34 +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:
--------------
    trunk/ChangeLog
    trunk/src/script/javascript.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-07-26 06:30:41 UTC (rev 4303)
+++ trunk/ChangeLog	2012-07-26 06:35:34 UTC (rev 4304)
@@ -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: trunk/src/script/javascript.cpp
===================================================================
--- trunk/src/script/javascript.cpp	2012-07-26 06:30:41 UTC (rev 4303)
+++ trunk/src/script/javascript.cpp	2012-07-26 06:35:34 UTC (rev 4304)
@@ -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.