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
3f37fd44
Commit
3f37fd44
authored
Aug 04, 2016
by
Andrew Twyman
Committed by
GitHub
Aug 04, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #267 from konovalov-aleks/fix_duplicate_header_include
fix #262
parents
3a24d6fc
32c36c28
Changes
15
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
13 additions
and
17 deletions
+13
-17
src/source/ObjcppGenerator.scala
src/source/ObjcppGenerator.scala
+10
-3
src/source/generator.scala
src/source/generator.scala
+3
-1
test-suite/generated-src/jni/NativeClientInterface.cpp
test-suite/generated-src/jni/NativeClientInterface.cpp
+0
-1
test-suite/generated-src/jni/NativeCppException.cpp
test-suite/generated-src/jni/NativeCppException.cpp
+0
-1
test-suite/generated-src/jni/NativeListenerCaller.cpp
test-suite/generated-src/jni/NativeListenerCaller.cpp
+0
-1
test-suite/generated-src/jni/NativeReturnOne.cpp
test-suite/generated-src/jni/NativeReturnOne.cpp
+0
-1
test-suite/generated-src/jni/NativeReturnTwo.cpp
test-suite/generated-src/jni/NativeReturnTwo.cpp
+0
-1
test-suite/generated-src/jni/NativeReverseClientInterface.cpp
...-suite/generated-src/jni/NativeReverseClientInterface.cpp
+0
-1
test-suite/generated-src/objc/DBClientInterface+Private.mm
test-suite/generated-src/objc/DBClientInterface+Private.mm
+0
-1
test-suite/generated-src/objc/DBCppException+Private.mm
test-suite/generated-src/objc/DBCppException+Private.mm
+0
-1
test-suite/generated-src/objc/DBExtendedRecord+Private.mm
test-suite/generated-src/objc/DBExtendedRecord+Private.mm
+0
-1
test-suite/generated-src/objc/DBListenerCaller+Private.mm
test-suite/generated-src/objc/DBListenerCaller+Private.mm
+0
-1
test-suite/generated-src/objc/DBReturnOne+Private.mm
test-suite/generated-src/objc/DBReturnOne+Private.mm
+0
-1
test-suite/generated-src/objc/DBReturnTwo+Private.mm
test-suite/generated-src/objc/DBReturnTwo+Private.mm
+0
-1
test-suite/generated-src/objc/DBReverseClientInterface+Private.mm
...te/generated-src/objc/DBReverseClientInterface+Private.mm
+0
-1
No files found.
src/source/ObjcppGenerator.scala
View file @
3f37fd44
...
...
@@ -379,9 +379,16 @@ class ObjcppGenerator(spec: Spec) extends BaseObjcGenerator(spec) {
w
.
wl
(
"// This file generated by Djinni from "
+
origin
)
w
.
wl
if
(
refs
.
nonEmpty
)
{
var
included
=
mutable
.
TreeSet
[
String
]();
for
(
s
<-
refs
)
{
// Ignore the ! in front of each line; used to put own headers to the top
// according to Objective-C style guide
refs
.
foreach
(
s
=>
w
.
wl
(
if
(
s
.
charAt
(
0
)
==
'!'
)
s
.
substring
(
1
)
else
s
))
val
include
=
if
(
s
.
charAt
(
0
)
==
'!'
)
s
.
substring
(
1
)
else
s
if
(!
included
.
contains
(
include
))
{
included
+=
include
w
.
wl
(
include
)
}
}
w
.
wl
}
f
(
w
)
...
...
src/source/generator.scala
View file @
3f37fd44
...
...
@@ -309,7 +309,9 @@ abstract class Generator(spec: Spec)
w
.
wl
val
myHeader
=
q
(
includePrefix
+
fileIdentStyle
(
name
)
+
"."
+
spec
.
cppHeaderExt
)
w
.
wl
(
s
"#include $myHeader // my header"
)
includes
.
foreach
(
w
.
wl
(
_
))
val
myHeaderInclude
=
s
"#include $myHeader"
for
(
include
<-
includes
if
include
!=
myHeaderInclude
)
w
.
wl
(
include
)
w
.
wl
wrapNamespace
(
w
,
namespace
,
f
)
})
...
...
test-suite/generated-src/jni/NativeClientInterface.cpp
View file @
3f37fd44
...
...
@@ -3,7 +3,6 @@
#include "NativeClientInterface.hpp" // my header
#include "Marshal.hpp"
#include "NativeClientInterface.hpp"
#include "NativeClientReturnedRecord.hpp"
namespace
djinni_generated
{
...
...
test-suite/generated-src/jni/NativeCppException.cpp
View file @
3f37fd44
...
...
@@ -3,7 +3,6 @@
#include "NativeCppException.hpp" // my header
#include "Marshal.hpp"
#include "NativeCppException.hpp"
namespace
djinni_generated
{
...
...
test-suite/generated-src/jni/NativeListenerCaller.cpp
View file @
3f37fd44
...
...
@@ -3,7 +3,6 @@
#include "NativeListenerCaller.hpp" // my header
#include "NativeFirstListener.hpp"
#include "NativeListenerCaller.hpp"
#include "NativeSecondListener.hpp"
namespace
djinni_generated
{
...
...
test-suite/generated-src/jni/NativeReturnOne.cpp
View file @
3f37fd44
...
...
@@ -3,7 +3,6 @@
#include "NativeReturnOne.hpp" // my header
#include "Marshal.hpp"
#include "NativeReturnOne.hpp"
namespace
djinni_generated
{
...
...
test-suite/generated-src/jni/NativeReturnTwo.cpp
View file @
3f37fd44
...
...
@@ -3,7 +3,6 @@
#include "NativeReturnTwo.hpp" // my header
#include "Marshal.hpp"
#include "NativeReturnTwo.hpp"
namespace
djinni_generated
{
...
...
test-suite/generated-src/jni/NativeReverseClientInterface.cpp
View file @
3f37fd44
...
...
@@ -3,7 +3,6 @@
#include "NativeReverseClientInterface.hpp" // my header
#include "Marshal.hpp"
#include "NativeReverseClientInterface.hpp"
namespace
djinni_generated
{
...
...
test-suite/generated-src/objc/DBClientInterface+Private.mm
View file @
3f37fd44
...
...
@@ -3,7 +3,6 @@
#import "DBClientInterface+Private.h"
#import "DBClientInterface.h"
#import "DBClientInterface+Private.h"
#import "DBClientReturnedRecord+Private.h"
#import "DJIMarshal+Private.h"
#import "DJIObjcWrapperCache+Private.h"
...
...
test-suite/generated-src/objc/DBCppException+Private.mm
View file @
3f37fd44
...
...
@@ -3,7 +3,6 @@
#import "DBCppException+Private.h"
#import "DBCppException.h"
#import "DBCppException+Private.h"
#import "DJICppWrapperCache+Private.h"
#import "DJIError.h"
#import "DJIMarshal+Private.h"
...
...
test-suite/generated-src/objc/DBExtendedRecord+Private.mm
View file @
3f37fd44
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from extended_record.djinni
#import "DBExtendedRecord+Private.h"
#import "DBExtendedRecord+Private.h"
#import "DJIMarshal+Private.h"
#include <cassert>
...
...
test-suite/generated-src/objc/DBListenerCaller+Private.mm
View file @
3f37fd44
...
...
@@ -4,7 +4,6 @@
#import "DBListenerCaller+Private.h"
#import "DBListenerCaller.h"
#import "DBFirstListener+Private.h"
#import "DBListenerCaller+Private.h"
#import "DBSecondListener+Private.h"
#import "DJICppWrapperCache+Private.h"
#import "DJIError.h"
...
...
test-suite/generated-src/objc/DBReturnOne+Private.mm
View file @
3f37fd44
...
...
@@ -3,7 +3,6 @@
#import "DBReturnOne+Private.h"
#import "DBReturnOne.h"
#import "DBReturnOne+Private.h"
#import "DJICppWrapperCache+Private.h"
#import "DJIError.h"
#import "DJIMarshal+Private.h"
...
...
test-suite/generated-src/objc/DBReturnTwo+Private.mm
View file @
3f37fd44
...
...
@@ -3,7 +3,6 @@
#import "DBReturnTwo+Private.h"
#import "DBReturnTwo.h"
#import "DBReturnTwo+Private.h"
#import "DJICppWrapperCache+Private.h"
#import "DJIError.h"
#import "DJIMarshal+Private.h"
...
...
test-suite/generated-src/objc/DBReverseClientInterface+Private.mm
View file @
3f37fd44
...
...
@@ -3,7 +3,6 @@
#import "DBReverseClientInterface+Private.h"
#import "DBReverseClientInterface.h"
#import "DBReverseClientInterface+Private.h"
#import "DJICppWrapperCache+Private.h"
#import "DJIError.h"
#import "DJIMarshal+Private.h"
...
...
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