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
1ef25936
Commit
1ef25936
authored
Apr 08, 2015
by
j4cbo
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #55 from mrdomino/fix-objc-cpp-prefix
Include cpp prefix in Objective-C C++ includes
parents
3e95fe26
8fc61ee2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
src/source/ObjcGenerator.scala
src/source/ObjcGenerator.scala
+3
-3
No files found.
src/source/ObjcGenerator.scala
View file @
1ef25936
...
@@ -68,7 +68,7 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) {
...
@@ -68,7 +68,7 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) {
refs
.
privHeader
.
add
(
"#import <Foundation/Foundation.h>"
)
refs
.
privHeader
.
add
(
"#import <Foundation/Foundation.h>"
)
refs
.
privHeader
.
add
(
"!#import "
+
q
(
headerName
(
ident
)))
refs
.
privHeader
.
add
(
"!#import "
+
q
(
headerName
(
ident
)))
refs
.
privHeader
.
add
(
"!#include "
+
q
(
spec
.
cppFileIdentStyle
(
ident
)
+
"."
+
spec
.
cppHeaderExt
))
refs
.
privHeader
.
add
(
"!#include "
+
q
(
spec
.
objcIncludeCppPrefix
+
spec
.
cppFileIdentStyle
(
ident
)
+
"."
+
spec
.
cppHeaderExt
))
refs
.
body
.
add
(
"#import <Foundation/Foundation.h>"
)
refs
.
body
.
add
(
"#import <Foundation/Foundation.h>"
)
refs
.
body
.
add
(
"!#import "
+
q
(
enumTranslatorHeaderName
(
ident
)))
refs
.
body
.
add
(
"!#import "
+
q
(
enumTranslatorHeaderName
(
ident
)))
...
@@ -189,7 +189,7 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) {
...
@@ -189,7 +189,7 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) {
refs
.
privHeader
.
add
(
"#import <Foundation/Foundation.h>"
)
refs
.
privHeader
.
add
(
"#import <Foundation/Foundation.h>"
)
refs
.
privHeader
.
add
(
"#include <memory>"
)
refs
.
privHeader
.
add
(
"#include <memory>"
)
refs
.
privHeader
.
add
(
"!#import "
+
q
(
headerName
(
ident
)))
refs
.
privHeader
.
add
(
"!#import "
+
q
(
headerName
(
ident
)))
refs
.
privHeader
.
add
(
"!#include "
+
q
(
spec
.
cppFileIdentStyle
(
ident
)
+
"."
+
spec
.
cppHeaderExt
))
refs
.
privHeader
.
add
(
"!#include "
+
q
(
spec
.
objcIncludeCppPrefix
+
spec
.
cppFileIdentStyle
(
ident
)
+
"."
+
spec
.
cppHeaderExt
))
def
writeObjcFuncDecl
(
method
:
Interface.Method
,
w
:
IndentWriter
)
{
def
writeObjcFuncDecl
(
method
:
Interface.Method
,
w
:
IndentWriter
)
{
val
label
=
if
(
method
.
static
)
"+"
else
"-"
val
label
=
if
(
method
.
static
)
"+"
else
"-"
...
@@ -398,7 +398,7 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) {
...
@@ -398,7 +398,7 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) {
refs
.
privHeader
.
add
(
"#import <Foundation/Foundation.h>"
)
refs
.
privHeader
.
add
(
"#import <Foundation/Foundation.h>"
)
refs
.
privHeader
.
add
(
"!#import "
+
q
(
headerName
(
objcName
)))
refs
.
privHeader
.
add
(
"!#import "
+
q
(
headerName
(
objcName
)))
refs
.
privHeader
.
add
(
"!#include "
+
q
(
spec
.
cppFileIdentStyle
(
ident
)
+
"."
+
spec
.
cppHeaderExt
))
refs
.
privHeader
.
add
(
"!#include "
+
q
(
spec
.
objcIncludeCppPrefix
+
spec
.
cppFileIdentStyle
(
ident
)
+
"."
+
spec
.
cppHeaderExt
))
refs
.
body
.
add
(
"#import <Foundation/Foundation.h>"
)
refs
.
body
.
add
(
"#import <Foundation/Foundation.h>"
)
refs
.
body
.
add
(
"#include <utility>"
)
refs
.
body
.
add
(
"#include <utility>"
)
...
...
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