Bug 1034302: Emit MOZ_OVERRIDE in XPIDL generated macros. r=bsmedberg

--HG--
extra : rebase_source : c2e5c46beb4e630f426dd89630abcf2460cb4772
This commit is contained in:
Kyle Huey 2014-08-21 10:49:39 -07:00
Родитель 6d59ed53db
Коммит 92e6296a70
1 изменённых файлов: 6 добавлений и 6 удалений

Просмотреть файл

@ -400,11 +400,11 @@ def write_interface(iface, fd):
for member in iface.members:
if isinstance(member, xpidl.Attribute):
fd.write("\\\n %s; " % attributeAsNative(member, True))
fd.write("\\\n %s MOZ_OVERRIDE; " % attributeAsNative(member, True))
if not member.readonly:
fd.write("\\\n %s; " % attributeAsNative(member, False))
fd.write("\\\n %s MOZ_OVERRIDE; " % attributeAsNative(member, False))
elif isinstance(member, xpidl.Method):
fd.write("\\\n %s; " % methodAsNative(member))
fd.write("\\\n %s MOZ_OVERRIDE; " % methodAsNative(member))
if len(iface.members) == 0:
fd.write('\\\n /* no methods! */')
elif not member.kind in ('attribute', 'method'):
@ -438,15 +438,15 @@ def write_interface(iface, fd):
elif not member.kind in ('attribute', 'method'):
fd.write('\\')
emitTemplate("\\\n %(asNative)s { return _to %(nativeName)s(%(paramList)s); } ")
emitTemplate("\\\n %(asNative)s MOZ_OVERRIDE { return _to %(nativeName)s(%(paramList)s); } ")
fd.write(iface_forward_safe % names)
# Don't try to safely forward notxpcom functions, because we have no
# sensible default error return. Instead, the caller will have to
# implement them.
emitTemplate("\\\n %(asNative)s { return !_to ? NS_ERROR_NULL_POINTER : _to->%(nativeName)s(%(paramList)s); } ",
"\\\n %(asNative)s; ")
emitTemplate("\\\n %(asNative)s MOZ_OVERRIDE { return !_to ? NS_ERROR_NULL_POINTER : _to->%(nativeName)s(%(paramList)s); } ",
"\\\n %(asNative)s MOZ_OVERRIDE; ")
fd.write(iface_template_prolog % names)