corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 784739 - Switch from NULL to nullptr in js/src/ (8/9); r=ehsan

Browse Source
This commit is contained in:
Birunthan Mohanathas
2013-10-07 12:44:28 -04:00
parent 2ce759decf
commit f5ac4df080
12 changed files with 186 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
js/src/jsweakmap.cpp
View File

@@ -65,10 +65,10 @@ WeakMapBase::traceAllMappings(WeakMapTracer *tracer)
void
WeakMapBase::resetCompartmentWeakMapList(JSCompartment *c)
{
JS_ASSERT(WeakMapNotInList != NULL);
JS_ASSERT(WeakMapNotInList != nullptr);
WeakMapBase *m = c->gcWeakMapList;
c->gcWeakMapList = NULL;
c->gcWeakMapList = nullptr;
while (m) {
WeakMapBase *n = m->next;
m->next = WeakMapNotInList;
@@ -117,8 +117,8 @@ static JSObject *
GetKeyArg(JSContext *cx, CallArgs &args)
{
if (args[0].isPrimitive()) {
JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_NOT_NONNULL_OBJECT);
return NULL;
JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NOT_NONNULL_OBJECT);
return nullptr;
}
return &args[0].toObject();
}
@@ -135,7 +135,7 @@ WeakMap_has_impl(JSContext *cx, CallArgs args)
JS_ASSERT(IsWeakMap(args.thisv()));
if (args.length() < 1) {
JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_MORE_ARGS_NEEDED,
JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
"WeakMap.has", "0", "s");
return false;
}
@@ -188,7 +188,7 @@ WeakMap_get_impl(JSContext *cx, CallArgs args)
JS_ASSERT(IsWeakMap(args.thisv()));
if (args.length() < 1) {
JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_MORE_ARGS_NEEDED,
JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
"WeakMap.get", "0", "s");
return false;
}
@@ -224,7 +224,7 @@ WeakMap_delete_impl(JSContext *cx, CallArgs args)
JS_ASSERT(IsWeakMap(args.thisv()));
if (args.length() < 1) {
JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_MORE_ARGS_NEEDED,
JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
"WeakMap.delete", "0", "s");
return false;
}
@@ -261,7 +261,7 @@ TryPreserveReflector(JSContext *cx, HandleObject obj)
{
JS_ASSERT(cx->runtime()->preserveWrapperCallback);
if (!cx->runtime()->preserveWrapperCallback(cx, obj)) {
JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_BAD_WEAKMAP_KEY);
JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_WEAKMAP_KEY);
return false;
}
}
@@ -274,7 +274,7 @@ WeakMap_set_impl(JSContext *cx, CallArgs args)
JS_ASSERT(IsWeakMap(args.thisv()));
if (args.length() < 1) {
JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_MORE_ARGS_NEEDED,
JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
"WeakMap.set", "0", "s");
return false;
}
@@ -331,7 +331,7 @@ JS_NondeterministicGetWeakMapKeys(JSContext *cx, JSObject *objArg, JSObject **re
RootedObject obj(cx, objArg);
obj = UncheckedUnwrap(obj);
if (!obj || !obj->is<WeakMapObject>()) {
*ret = NULL;
*ret = nullptr;
return true;
}
RootedObject arr(cx, NewDenseEmptyArray(cx));
@@ -398,10 +398,10 @@ const Class WeakMapObject::class_ = {
JS_ResolveStub,
JS_ConvertStub,
WeakMap_finalize,
NULL, /* checkAccess */
NULL, /* call */
NULL, /* construct */
NULL, /* xdrObject */
nullptr, /* checkAccess */
nullptr, /* call */
nullptr, /* construct */
nullptr, /* xdrObject */
WeakMap_mark
};
@@ -423,20 +423,20 @@ js_InitWeakMapClass(JSContext *cx, HandleObject obj)
RootedObject weakMapProto(cx, global->createBlankPrototype(cx, &WeakMapObject::class_));
if (!weakMapProto)
return NULL;
return nullptr;
RootedFunction ctor(cx, global->createConstructor(cx, WeakMap_construct,
cx->names().WeakMap, 0));
if (!ctor)
return NULL;
return nullptr;
if (!LinkConstructorAndPrototype(cx, ctor, weakMapProto))
return NULL;
return nullptr;
if (!DefinePropertiesAndBrand(cx, weakMapProto, NULL, weak_map_methods))
return NULL;
if (!DefinePropertiesAndBrand(cx, weakMapProto, nullptr, weak_map_methods))
return nullptr;
if (!DefineConstructorAndPrototype(cx, global, JSProto_WeakMap, ctor, weakMapProto))
return NULL;
return nullptr;
return weakMapProto;
}