Bug 1052358 - Non-unified build bustage fix. r=bustage in a CLOSED TREE
authorJeff Walden <jwalden@mit.edu>
Wed, 13 Aug 2014 13:56:52 -0700
changeset 199365 8b0121d2a03ade1e2150aae9bee7d7e73fa915cb
parent 199364 cd34fb602fc31643e031d0355651da5c31a2626e
child 199366 79f6d0449fd1d33154579cd9cceb60e3bf30154d
push id27305
push useremorley@mozilla.com
push dateThu, 14 Aug 2014 07:35:52 +0000
treeherdermozilla-central@8f922378fab0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1052358
milestone34.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
Bug 1052358 - Non-unified build bustage fix. r=bustage in a CLOSED TREE
js/src/builtin/Object.cpp
js/src/builtin/Object.h
--- a/js/src/builtin/Object.cpp
+++ b/js/src/builtin/Object.cpp
@@ -912,17 +912,17 @@ js::IdToStringOrSymbol(JSContext *cx, Ha
     }
     return true;
 }
 
 namespace js {
 
 /* ES6 draft rev 25 (2014 May 22) 19.1.2.8.1 */
 bool
-GetOwnPropertyKeys(JSContext *cx, const CallArgs &args, unsigned flags)
+GetOwnPropertyKeys(JSContext *cx, const JS::CallArgs &args, unsigned flags)
 {
     // steps 1-2
     RootedObject obj(cx, ToObject(cx, args.get(0)));
     if (!obj)
         return false;
 
     // steps 3-10
     AutoIdVector keys(cx);
--- a/js/src/builtin/Object.h
+++ b/js/src/builtin/Object.h
@@ -4,31 +4,34 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef builtin_Object_h
 #define builtin_Object_h
 
 #include "jsapi.h"
 
-namespace JS { class Value; }
+namespace JS {
+class CallArgs;
+class Value;
+}
 
 namespace js {
 
 extern const JSFunctionSpec object_methods[];
 extern const JSPropertySpec object_properties[];
 extern const JSFunctionSpec object_static_methods[];
 extern const JSFunctionSpec object_static_selfhosted_methods[];
 
 // Object constructor native. Exposed only so the JIT can know its address.
 bool
 obj_construct(JSContext *cx, unsigned argc, JS::Value *vp);
 
 // Exposed so SelfHosting.cpp can use it in the OwnPropertyKeys intrinsic
-bool GetOwnPropertyKeys(JSContext *cx, const CallArgs &args, unsigned flags);
+bool GetOwnPropertyKeys(JSContext *cx, const JS::CallArgs &args, unsigned flags);
 
 /*
  * Like IdToValue, but convert int jsids to strings. This is used when
  * exposing a jsid to script for Object.getOwnProperty{Names,Symbols}
  * or scriptable proxy traps.
  */
 bool
 IdToStringOrSymbol(JSContext *cx, JS::HandleId id, JS::MutableHandleValue result);