Bug 1105781 - Unbreak unified build after bug 1083648. r=bz, a=sledru
authorJan Beich <jbeich@vfemail.net>
Thu, 27 Nov 2014 10:01:00 +0100
changeset 242304 4fb4aec5a4e042624a36f421bc8f3af541913e6c
parent 242303 b89681da3281b0a8c7400bd0828be45ba7a6a319
child 242305 506962a16ce85f0a000b5ae0b16f4d4a787ac9b6
push id4311
push userraliiev@mozilla.com
push dateMon, 12 Jan 2015 19:37:41 +0000
treeherdermozilla-beta@150c9fed433b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz, sledru
bugs1105781, 1083648
milestone36.0a2
Bug 1105781 - Unbreak unified build after bug 1083648. r=bz, a=sledru
js/src/jsfun.cpp
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -1911,17 +1911,17 @@ FunctionConstructor(JSContext *cx, unsig
                                               ? SourceBufferHolder::GiveOwnership
                                               : SourceBufferHolder::NoOwnership;
     bool ok;
     SourceBufferHolder srcBuf(chars.start().get(), chars.length(), ownership);
     if (isStarGenerator)
         ok = frontend::CompileStarGeneratorBody(cx, &fun, options, formals, srcBuf);
     else
         ok = frontend::CompileFunctionBody(cx, &fun, options, formals, srcBuf,
-                                           /* enclosingScope = */ NullPtr());
+                                           /* enclosingScope = */ js::NullPtr());
     args.rval().setObject(*fun);
     return ok;
 }
 
 bool
 js::Function(JSContext *cx, unsigned argc, Value *vp)
 {
     return FunctionConstructor(cx, argc, vp, NotGenerator);