Bug 554850: silence JSBool -> bool conversion warnings in msvc. r=waldo

2010-04-01 16:54:57 -04:00
parent f5abaede2a
commit 36fd5c6b59
3 changed files with 10 additions and 10 deletions
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -2292,9 +2292,9 @@ array_sort(JSContext *cx, uintN argc, jsval *vp)
            ca.elemroot  = js_AllocStack(cx, 2 + 2, &mark);
            if (!ca.elemroot)
                return false;
-            bool ok = js_MergeSort(vec, size_t(newlen), sizeof(jsval),
-                                   comparator_stack_cast(sort_compare),
-                                   &ca, mergesort_tmp);
+            bool ok = !!js_MergeSort(vec, size_t(newlen), sizeof(jsval),
+                                     comparator_stack_cast(sort_compare),
+                                     &ca, mergesort_tmp);
            js_FreeStack(cx, mark);
            if (!ok)
                return false;