projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ef0eed8
)
Objective-C name clash avoidance
author
Giles Payne
<gilespayne@gmail.com>
Wed, 18 Nov 2020 13:06:59 +0000
(22:06 +0900)
committer
Chris Ballinger
<cballinger@rightpoint.com>
Tue, 1 Dec 2020 19:22:57 +0000
(11:22 -0800)
modules/objc/generator/gen_objc.py
patch
|
blob
|
history
diff --git
a/modules/objc/generator/gen_objc.py
b/modules/objc/generator/gen_objc.py
index
bd9743c
..
61d5e14
100755
(executable)
--- a/
modules/objc/generator/gen_objc.py
+++ b/
modules/objc/generator/gen_objc.py
@@
-570,7
+570,7
@@
def get_swift_type(ctype):
return swift_type
def build_swift_extension_decl(name, args, constructor, static, ret_type):
- extension_decl = ("class " if static else "") + (("func " + name) if not constructor else "convenience init") + "("
+ extension_decl =
"@nonobjc " +
("class " if static else "") + (("func " + name) if not constructor else "convenience init") + "("
swift_args = []
for a in args:
if a.ctype not in type_dict: