Merge.
authorJason Orendorff <jorendorff@mozilla.com>
Fri, 17 Jun 2011 11:12:33 -0500
changeset 74473 6885f4c66607709010eae5d47f39b6b22ee3f707
parent 74471 a95ab01cda09f6a4f344ed1898e4ff1bfd65a6d5 (current diff)
parent 74472 feb8c7a919b366b7d8c5390007cddf9c828a81d0 (diff)
child 74474 ac45a3dbfe3304dca3b9c9b0de4464f1e102a0b3
push id20986
push userkhuey@mozilla.com
push dateSun, 14 Aug 2011 11:45:15 +0000
treeherdermozilla-central@2de3cff973b2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone7.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge.
js/src/jsdbg.cpp
js/src/jsdbg.h
--- a/js/src/jsdbg.cpp
+++ b/js/src/jsdbg.cpp
@@ -1284,17 +1284,17 @@ EvaluateInScope(JSContext *cx, JSObject 
 }
 
 enum EvalBindingsMode { WithoutBindings, WithBindings };
 
 static JSBool
 DebugFrameEval(JSContext *cx, uintN argc, Value *vp, EvalBindingsMode mode)
 {
     REQUIRE_ARGC(mode == WithBindings ? "Debug.Frame.evalWithBindings" : "Debug.Frame.eval",
-                 mode == WithBindings ? 2 : 1);
+                 uintN(mode == WithBindings ? 2 : 1));
     THIS_FRAME(cx, vp, mode == WithBindings ? "evalWithBindings" : "eval", thisobj, fp);
     Debug *dbg = Debug::fromChildJSObject(&vp[1].toObject());
 
     // Check the first argument, the eval code string.
     if (!vp[2].isString()) {
         JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_NOT_EXPECTED_TYPE,
                              "Debug.Frame.eval", "string", InformalValueTypeName(vp[2]));
         return false;
--- a/js/src/jsdbg.h
+++ b/js/src/jsdbg.h
@@ -49,17 +49,17 @@
 #include "jsweakmap.h"
 #include "jswrapper.h"
 #include "jsvalue.h"
 #include "vm/GlobalObject.h"
 
 namespace js {
 
 class Debug {
-    friend JSBool ::JS_DefineDebugObject(JSContext *cx, JSObject *obj);
+    friend JSBool (::JS_DefineDebugObject)(JSContext *cx, JSObject *obj);
 
   private:
     JSCList link;                       // See JSRuntime::debuggerList.
     JSObject *object;                   // The Debug object. Strong reference.
     GlobalObjectSet debuggees;          // Debuggee globals. Cross-compartment weak references.
     JSObject *hooksObject;              // See Debug.prototype.hooks. Strong reference.
     JSObject *uncaughtExceptionHook;    // Strong reference.
     bool enabled;