Fix generation of nullary callbacks

This commit is contained in:
Anthony Ramine 2015-04-26 16:49:43 +02:00
parent 1389be3782
commit d4f809f95e
2 changed files with 2 additions and 5 deletions

View file

@ -4918,9 +4918,6 @@ class CGCallback(CGClass):
args.append(Argument("ExceptionHandling", "aExceptionHandling",
"ReportExceptions"))
args[0] = Argument(args[0].argType, args[0].name, args[0].default)
method.args[2] = args[0]
# And now insert our template argument.
argsWithoutThis = list(args)
args.insert(0, Argument("JSRef<T>", "thisObj"))
@ -5235,7 +5232,7 @@ class CallbackMethod(CallbackMember):
replacements["argv"] = "argv.as_mut_ptr()"
replacements["argc"] = "argc"
else:
replacements["argv"] = "nullptr"
replacements["argv"] = "ptr::null_mut()"
replacements["argc"] = "0"
return string.Template("${getCallable}"
"let ok = unsafe {\n"