Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
djinni
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
djinni
Commits
a512f387
Commit
a512f387
authored
Apr 08, 2015
by
j4cbo
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #67 from mrdomino/fix-objcproxy-namespace
Correct namespace for ObjcProxy return types
parents
a659825a
21fecda4
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
src/source/ObjcGenerator.scala
src/source/ObjcGenerator.scala
+2
-2
No files found.
src/source/ObjcGenerator.scala
View file @
a512f387
...
@@ -327,7 +327,7 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) {
...
@@ -327,7 +327,7 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) {
w
.
wl
(
s
"virtual ~$objcExtSelf () override;"
)
w
.
wl
(
s
"virtual ~$objcExtSelf () override;"
)
w
.
wl
(
s
"static std::shared_ptr<${withNs(spec.cppNamespace, idCpp.ty(ident.name))}> ${idCpp.method(ident.name + "
_with_objc
")} (id objcRef);"
)
w
.
wl
(
s
"static std::shared_ptr<${withNs(spec.cppNamespace, idCpp.ty(ident.name))}> ${idCpp.method(ident.name + "
_with_objc
")} (id objcRef);"
)
for
(
m
<-
i
.
methods
)
{
for
(
m
<-
i
.
methods
)
{
val
ret
=
m
.
ret
.
fold
(
"void"
)(
toCppType
(
_
))
val
ret
=
m
.
ret
.
fold
(
"void"
)(
toCppType
(
_
,
spec
.
cppNamespace
))
val
params
=
m
.
params
.
map
(
p
=>
toCppParamType
(
p
,
spec
.
cppNamespace
))
val
params
=
m
.
params
.
map
(
p
=>
toCppParamType
(
p
,
spec
.
cppNamespace
))
w
.
wl
(
s
"virtual $ret ${idCpp.method(m.ident)} ${params.mkString("
(
", "
,
", "
)
")} override;"
)
w
.
wl
(
s
"virtual $ret ${idCpp.method(m.ident)} ${params.mkString("
(
", "
,
", "
)
")} override;"
)
}
}
...
@@ -356,7 +356,7 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) {
...
@@ -356,7 +356,7 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) {
}
}
for
(
m
<-
i
.
methods
)
{
for
(
m
<-
i
.
methods
)
{
w
.
wl
w
.
wl
val
ret
=
m
.
ret
.
fold
(
"void"
)(
toCppType
(
_
))
val
ret
=
m
.
ret
.
fold
(
"void"
)(
toCppType
(
_
,
spec
.
cppNamespace
))
val
params
=
m
.
params
.
map
(
p
=>
toCppParamType
(
p
,
spec
.
cppNamespace
))
val
params
=
m
.
params
.
map
(
p
=>
toCppParamType
(
p
,
spec
.
cppNamespace
))
w
.
wl
(
s
"$ret $objcExtSelf::${idCpp.method(m.ident)} ${params.mkString("
(
", "
,
", "
)
")}"
).
braced
{
w
.
wl
(
s
"$ret $objcExtSelf::${idCpp.method(m.ident)} ${params.mkString("
(
", "
,
", "
)
")}"
).
braced
{
w
.
w
(
"@autoreleasepool"
).
braced
{
w
.
w
(
"@autoreleasepool"
).
braced
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment