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
ee0c2c1e
Commit
ee0c2c1e
authored
Feb 08, 2016
by
Andrew Twyman
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #206 from tiwoc/nn-hppgen-fix
CppMarshal: Always emit nn header include for interface
parents
14df0468
c6740ad9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
src/source/CppMarshal.scala
src/source/CppMarshal.scala
+6
-6
No files found.
src/source/CppMarshal.scala
View file @
ee0c2c1e
...
...
@@ -66,15 +66,15 @@ class CppMarshal(spec: Spec) extends Marshal(spec) {
List
()
}
case
DInterface
=>
if
(
d
.
name
!=
exclude
)
{
val
base
=
List
(
ImportRef
(
"<memory>"
),
DeclRef
(
s
"class ${typename(d.name, d.body)};"
,
Some
(
spec
.
cppNamespace
)))
val
base
=
if
(
d
.
name
!=
exclude
)
{
List
(
ImportRef
(
"<memory>"
),
DeclRef
(
s
"class ${typename(d.name, d.body)};"
,
Some
(
spec
.
cppNamespace
)))
}
else
{
List
(
ImportRef
(
"<memory>"
))
}
spec
.
cppNnHeader
match
{
case
Some
(
nnHdr
)
=>
ImportRef
(
nnHdr
)
::
base
case
_
=>
base
}
}
else
{
List
(
ImportRef
(
"<memory>"
))
}
}
case
e
:
MExtern
=>
e
.
defType
match
{
// Do not forward declare extern types, they might be in arbitrary namespaces.
...
...
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