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
3a24d6fc
Commit
3a24d6fc
authored
Aug 04, 2016
by
Andrew Twyman
Committed by
GitHub
Aug 04, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #259 from dropbox/AT/WIP/EnumFix
Fix enum compile issue in C++11
parents
f4ce7601
22fb0167
Changes
44
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
44 changed files
with
1879 additions
and
245 deletions
+1879
-245
example/generated-src/objc/TXSSortItems+Private.mm
example/generated-src/objc/TXSSortItems+Private.mm
+1
-1
example/generated-src/objc/TXSSortOrder+Private.h
example/generated-src/objc/TXSSortOrder+Private.h
+6
-0
src/.idea/encodings.xml
src/.idea/encodings.xml
+4
-3
src/.idea/sbt.xml
src/.idea/sbt.xml
+6
-0
src/.idea/vcs.xml
src/.idea/vcs.xml
+0
-1
src/source/ObjcppGenerator.scala
src/source/ObjcppGenerator.scala
+5
-1
src/source/ObjcppMarshal.scala
src/source/ObjcppMarshal.scala
+2
-7
test-suite/djinni/enum.djinni
test-suite/djinni/enum.djinni
+14
-2
test-suite/generated-src/cpp/assorted_primitives.hpp
test-suite/generated-src/cpp/assorted_primitives.hpp
+1
-1
test-suite/generated-src/cpp/client_interface.hpp
test-suite/generated-src/cpp/client_interface.hpp
+1
-1
test-suite/generated-src/cpp/client_returned_record.hpp
test-suite/generated-src/cpp/client_returned_record.hpp
+1
-1
test-suite/generated-src/cpp/constants.hpp
test-suite/generated-src/cpp/constants.hpp
+1
-1
test-suite/generated-src/cpp/constants_interface.hpp
test-suite/generated-src/cpp/constants_interface.hpp
+1
-1
test-suite/generated-src/cpp/enum_usage_interface.hpp
test-suite/generated-src/cpp/enum_usage_interface.hpp
+30
-0
test-suite/generated-src/cpp/enum_usage_record.hpp
test-suite/generated-src/cpp/enum_usage_record.hpp
+35
-0
test-suite/generated-src/cpp/opt_color_record.hpp
test-suite/generated-src/cpp/opt_color_record.hpp
+0
-20
test-suite/generated-src/cpp/reverse_client_interface.hpp
test-suite/generated-src/cpp/reverse_client_interface.hpp
+1
-1
test-suite/generated-src/cpp/test_duration.hpp
test-suite/generated-src/cpp/test_duration.hpp
+1
-1
test-suite/generated-src/cpp/test_helpers.hpp
test-suite/generated-src/cpp/test_helpers.hpp
+1
-1
test-suite/generated-src/java/com/dropbox/djinni/test/EnumUsageInterface.java
...-src/java/com/dropbox/djinni/test/EnumUsageInterface.java
+92
-0
test-suite/generated-src/java/com/dropbox/djinni/test/EnumUsageRecord.java
...ted-src/java/com/dropbox/djinni/test/EnumUsageRecord.java
+74
-0
test-suite/generated-src/java/com/dropbox/djinni/test/OptColorRecord.java
...ated-src/java/com/dropbox/djinni/test/OptColorRecord.java
+0
-31
test-suite/generated-src/jni/NativeEnumUsageInterface.cpp
test-suite/generated-src/jni/NativeEnumUsageInterface.cpp
+122
-0
test-suite/generated-src/jni/NativeEnumUsageInterface.hpp
test-suite/generated-src/jni/NativeEnumUsageInterface.hpp
+54
-0
test-suite/generated-src/jni/NativeEnumUsageRecord.cpp
test-suite/generated-src/jni/NativeEnumUsageRecord.cpp
+37
-0
test-suite/generated-src/jni/NativeEnumUsageRecord.hpp
test-suite/generated-src/jni/NativeEnumUsageRecord.hpp
+36
-0
test-suite/generated-src/jni/NativeOptColorRecord.cpp
test-suite/generated-src/jni/NativeOptColorRecord.cpp
+0
-29
test-suite/generated-src/objc/DBColor+Private.h
test-suite/generated-src/objc/DBColor+Private.h
+6
-0
test-suite/generated-src/objc/DBEnumUsageInterface+Private.h
test-suite/generated-src/objc/DBEnumUsageInterface+Private.h
+31
-0
test-suite/generated-src/objc/DBEnumUsageInterface+Private.mm
...-suite/generated-src/objc/DBEnumUsageInterface+Private.mm
+142
-0
test-suite/generated-src/objc/DBEnumUsageInterface.h
test-suite/generated-src/objc/DBEnumUsageInterface.h
+20
-0
test-suite/generated-src/objc/DBEnumUsageRecord+Private.h
test-suite/generated-src/objc/DBEnumUsageRecord+Private.h
+7
-7
test-suite/generated-src/objc/DBEnumUsageRecord+Private.mm
test-suite/generated-src/objc/DBEnumUsageRecord+Private.mm
+30
-0
test-suite/generated-src/objc/DBEnumUsageRecord.h
test-suite/generated-src/objc/DBEnumUsageRecord.h
+29
-0
test-suite/generated-src/objc/DBEnumUsageRecord.mm
test-suite/generated-src/objc/DBEnumUsageRecord.mm
+43
-0
test-suite/generated-src/objc/DBExternRecordWithDerivings+Private.mm
...generated-src/objc/DBExternRecordWithDerivings+Private.mm
+1
-1
test-suite/generated-src/objc/DBOptColorRecord+Private.mm
test-suite/generated-src/objc/DBOptColorRecord+Private.mm
+0
-21
test-suite/generated-src/objc/DBOptColorRecord.mm
test-suite/generated-src/objc/DBOptColorRecord.mm
+0
-27
test-suite/generated-src/objc/DBTestHelpers+Private.mm
test-suite/generated-src/objc/DBTestHelpers+Private.mm
+1
-0
test-suite/generated-src/outFileList.txt
test-suite/generated-src/outFileList.txt
+16
-8
test-suite/handwritten-src/cpp/optional.hpp
test-suite/handwritten-src/cpp/optional.hpp
+891
-0
test-suite/java/CMakeLists.txt
test-suite/java/CMakeLists.txt
+1
-1
test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj
test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj
+132
-74
test-suite/run_djinni.sh
test-suite/run_djinni.sh
+3
-3
No files found.
example/generated-src/objc/TXSSortItems+Private.mm
View file @
3a24d6fc
...
...
@@ -5,9 +5,9 @@
#import "TXSSortItems.h"
#import "DJICppWrapperCache+Private.h"
#import "DJIError.h"
#import "DJIMarshal+Private.h"
#import "TXSItemList+Private.h"
#import "TXSSortItems+Private.h"
#import "TXSSortOrder+Private.h"
#import "TXSTextboxListener+Private.h"
#include <exception>
#include <utility>
...
...
example/generated-src/objc/TXSSortOrder+Private.h
0 → 100644
View file @
3a24d6fc
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from example.djinni
#include "sort_order.hpp"
#import "DJIMarshal+Private.h"
src/.idea/encodings.xml
View file @
3a24d6fc
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"Encoding"
useUTFGuessing=
"true"
native2AsciiForPropertiesFiles=
"false"
/>
</project>
<component
name=
"Encoding"
useUTFGuessing=
"true"
native2AsciiForPropertiesFiles=
"false"
>
<file
url=
"PROJECT"
charset=
"UTF-8"
/>
</component>
</project>
\ No newline at end of file
src/.idea/sbt.xml
View file @
3a24d6fc
...
...
@@ -13,6 +13,12 @@
<option
name=
"sbtVersion"
value=
"0.13.5"
/>
<option
name=
"useAutoImport"
value=
"true"
/>
<option
name=
"useOurOwnAutoImport"
value=
"true"
/>
<option
name=
"myModules"
>
<set>
<option
value=
"$PROJECT_DIR$"
/>
<option
value=
"$PROJECT_DIR$/project"
/>
</set>
</option>
</SbtProjectSettings>
</option>
</component>
...
...
src/.idea/vcs.xml
View file @
3a24d6fc
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"VcsDirectoryMappings"
>
<mapping
directory=
""
vcs=
""
/>
<mapping
directory=
"$PROJECT_DIR$/.."
vcs=
"Git"
/>
</component>
</project>
\ No newline at end of file
src/source/ObjcppGenerator.scala
View file @
3a24d6fc
...
...
@@ -49,7 +49,11 @@ class ObjcppGenerator(spec: Spec) extends BaseObjcGenerator(spec) {
private
def
arcAssert
(
w
:
IndentWriter
)
=
w
.
wl
(
"static_assert(__has_feature(objc_arc), "
+
q
(
"Djinni requires ARC to be enabled for this file"
)
+
");"
)
override
def
generateEnum
(
origin
:
String
,
ident
:
Ident
,
doc
:
Doc
,
e
:
Enum
)
{
// No generation required
var
imports
=
mutable
.
TreeSet
[
String
]()
imports
.
add
(
"#import "
+
q
(
spec
.
objcBaseLibIncludePrefix
+
"DJIMarshal+Private.h"
))
imports
.
add
(
"!#include "
+
q
(
spec
.
objcppIncludeCppPrefix
+
spec
.
cppFileIdentStyle
(
ident
)
+
"."
+
spec
.
cppHeaderExt
))
writeObjcFile
(
objcppMarshal
.
privateHeaderName
(
ident
.
name
),
origin
,
imports
,
w
=>
{}
)
}
def
headerName
(
ident
:
String
)
:
String
=
idObjc
.
ty
(
ident
)
+
"."
+
spec
.
objcHeaderExt
...
...
src/source/ObjcppMarshal.scala
View file @
3a24d6fc
...
...
@@ -34,9 +34,7 @@ class ObjcppMarshal(spec: Spec) extends Marshal(spec) {
case
o
:
MOpaque
=>
List
(
ImportRef
(
q
(
spec
.
objcBaseLibIncludePrefix
+
"DJIMarshal+Private.h"
)))
case
d
:
MDef
=>
d
.
defType
match
{
case
DEnum
=>
List
(
ImportRef
(
q
(
spec
.
objcBaseLibIncludePrefix
+
"DJIMarshal+Private.h"
)))
case
DInterface
=>
case
DEnum
|
DInterface
=>
List
(
ImportRef
(
include
(
m
)))
case
DRecord
=>
val
r
=
d
.
body
.
asInstanceOf
[
Record
]
...
...
@@ -48,10 +46,7 @@ class ObjcppMarshal(spec: Spec) extends Marshal(spec) {
}
def
include
(
m
:
Meta
)
=
m
match
{
case
d
:
MDef
=>
d
.
defType
match
{
case
DEnum
=>
q
(
spec
.
objcBaseLibIncludePrefix
+
"DJIMarshal+Private.h"
)
case
_
=>
q
(
spec
.
objcppIncludePrefix
+
privateHeaderName
(
d
.
name
))
}
case
d
:
MDef
=>
q
(
spec
.
objcppIncludePrefix
+
privateHeaderName
(
d
.
name
))
case
_
=>
throw
new
AssertionError
(
"not applicable"
)
}
...
...
test-suite/djinni/enum.djinni
View file @
3a24d6fc
...
...
@@ -11,6 +11,18 @@ color = enum {
violet;
}
opt_color_record = record {
my_color: optional<color>;
enum_usage_record = record {
e: color;
o: optional<color>;
l: list<color>;
s: set<color>;
m: map<color, color>;
}
enum_usage_interface = interface +c +j +o {
e(e: color): color;
o(o: optional<color>): optional<color>;
l(l: list<color>): list<color>;
s(s: set<color>): set<color>;
m(m: map<color, color>): map<color, color>;
}
test-suite/generated-src/cpp/assorted_primitives.hpp
View file @
3a24d6fc
...
...
@@ -3,8 +3,8 @@
#pragma once
#include "../../handwritten-src/cpp/optional.hpp"
#include <cstdint>
#include <experimental/optional>
#include <utility>
namespace
testsuite
{
...
...
test-suite/generated-src/cpp/client_interface.hpp
View file @
3a24d6fc
...
...
@@ -3,8 +3,8 @@
#pragma once
#include "../../handwritten-src/cpp/optional.hpp"
#include <cstdint>
#include <experimental/optional>
#include <memory>
#include <string>
#include <vector>
...
...
test-suite/generated-src/cpp/client_returned_record.hpp
View file @
3a24d6fc
...
...
@@ -3,8 +3,8 @@
#pragma once
#include "../../handwritten-src/cpp/optional.hpp"
#include <cstdint>
#include <experimental/optional>
#include <string>
#include <utility>
...
...
test-suite/generated-src/cpp/constants.hpp
View file @
3a24d6fc
...
...
@@ -3,9 +3,9 @@
#pragma once
#include "../../handwritten-src/cpp/optional.hpp"
#include "constant_record.hpp"
#include <cstdint>
#include <experimental/optional>
#include <string>
#include <utility>
...
...
test-suite/generated-src/cpp/constants_interface.hpp
View file @
3a24d6fc
...
...
@@ -3,8 +3,8 @@
#pragma once
#include "../../handwritten-src/cpp/optional.hpp"
#include <cstdint>
#include <experimental/optional>
#include <string>
namespace
testsuite
{
...
...
test-suite/generated-src/cpp/enum_usage_interface.hpp
0 → 100644
View file @
3a24d6fc
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from enum.djinni
#pragma once
#include "../../handwritten-src/cpp/optional.hpp"
#include <unordered_map>
#include <unordered_set>
#include <vector>
namespace
testsuite
{
enum
class
color
;
class
EnumUsageInterface
{
public:
virtual
~
EnumUsageInterface
()
{}
virtual
color
e
(
color
e
)
=
0
;
virtual
std
::
experimental
::
optional
<
color
>
o
(
std
::
experimental
::
optional
<
color
>
o
)
=
0
;
virtual
std
::
vector
<
color
>
l
(
const
std
::
vector
<
color
>
&
l
)
=
0
;
virtual
std
::
unordered_set
<
color
>
s
(
const
std
::
unordered_set
<
color
>
&
s
)
=
0
;
virtual
std
::
unordered_map
<
color
,
color
>
m
(
const
std
::
unordered_map
<
color
,
color
>
&
m
)
=
0
;
};
}
// namespace testsuite
test-suite/generated-src/cpp/enum_usage_record.hpp
0 → 100644
View file @
3a24d6fc
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from enum.djinni
#pragma once
#include "../../handwritten-src/cpp/optional.hpp"
#include "color.hpp"
#include <unordered_map>
#include <unordered_set>
#include <utility>
#include <vector>
namespace
testsuite
{
struct
EnumUsageRecord
final
{
color
e
;
std
::
experimental
::
optional
<
color
>
o
;
std
::
vector
<
color
>
l
;
std
::
unordered_set
<
color
>
s
;
std
::
unordered_map
<
color
,
color
>
m
;
EnumUsageRecord
(
color
e_
,
std
::
experimental
::
optional
<
color
>
o_
,
std
::
vector
<
color
>
l_
,
std
::
unordered_set
<
color
>
s_
,
std
::
unordered_map
<
color
,
color
>
m_
)
:
e
(
std
::
move
(
e_
))
,
o
(
std
::
move
(
o_
))
,
l
(
std
::
move
(
l_
))
,
s
(
std
::
move
(
s_
))
,
m
(
std
::
move
(
m_
))
{}
};
}
// namespace testsuite
test-suite/generated-src/cpp/opt_color_record.hpp
deleted
100644 → 0
View file @
f4ce7601
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from enum.djinni
#pragma once
#include "color.hpp"
#include <experimental/optional>
#include <utility>
namespace
testsuite
{
struct
OptColorRecord
final
{
std
::
experimental
::
optional
<
color
>
my_color
;
OptColorRecord
(
std
::
experimental
::
optional
<
color
>
my_color_
)
:
my_color
(
std
::
move
(
my_color_
))
{}
};
}
// namespace testsuite
test-suite/generated-src/cpp/reverse_client_interface.hpp
View file @
3a24d6fc
...
...
@@ -3,7 +3,7 @@
#pragma once
#include
<experimental/optional>
#include
"../../handwritten-src/cpp/optional.hpp"
#include <memory>
#include <string>
...
...
test-suite/generated-src/cpp/test_duration.hpp
View file @
3a24d6fc
...
...
@@ -3,9 +3,9 @@
#pragma once
#include "../../handwritten-src/cpp/optional.hpp"
#include <chrono>
#include <cstdint>
#include <experimental/optional>
#include <string>
namespace
testsuite
{
...
...
test-suite/generated-src/cpp/test_helpers.hpp
View file @
3a24d6fc
...
...
@@ -3,8 +3,8 @@
#pragma once
#include "../../handwritten-src/cpp/optional.hpp"
#include <cstdint>
#include <experimental/optional>
#include <memory>
#include <string>
#include <unordered_map>
...
...
test-suite/generated-src/java/com/dropbox/djinni/test/EnumUsageInterface.java
0 → 100644
View file @
3a24d6fc
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from enum.djinni
package
com.dropbox.djinni.test
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.HashSet
;
import
java.util.concurrent.atomic.AtomicBoolean
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
public
abstract
class
EnumUsageInterface
{
@Nonnull
public
abstract
Color
e
(
@Nonnull
Color
e
);
@CheckForNull
public
abstract
Color
o
(
@CheckForNull
Color
o
);
@Nonnull
public
abstract
ArrayList
<
Color
>
l
(
@Nonnull
ArrayList
<
Color
>
l
);
@Nonnull
public
abstract
HashSet
<
Color
>
s
(
@Nonnull
HashSet
<
Color
>
s
);
@Nonnull
public
abstract
HashMap
<
Color
,
Color
>
m
(
@Nonnull
HashMap
<
Color
,
Color
>
m
);
private
static
final
class
CppProxy
extends
EnumUsageInterface
{
private
final
long
nativeRef
;
private
final
AtomicBoolean
destroyed
=
new
AtomicBoolean
(
false
);
private
CppProxy
(
long
nativeRef
)
{
if
(
nativeRef
==
0
)
throw
new
RuntimeException
(
"nativeRef is zero"
);
this
.
nativeRef
=
nativeRef
;
}
private
native
void
nativeDestroy
(
long
nativeRef
);
public
void
destroy
()
{
boolean
destroyed
=
this
.
destroyed
.
getAndSet
(
true
);
if
(!
destroyed
)
nativeDestroy
(
this
.
nativeRef
);
}
protected
void
finalize
()
throws
java
.
lang
.
Throwable
{
destroy
();
super
.
finalize
();
}
@Override
public
Color
e
(
Color
e
)
{
assert
!
this
.
destroyed
.
get
()
:
"trying to use a destroyed object"
;
return
native_e
(
this
.
nativeRef
,
e
);
}
private
native
Color
native_e
(
long
_nativeRef
,
Color
e
);
@Override
public
Color
o
(
Color
o
)
{
assert
!
this
.
destroyed
.
get
()
:
"trying to use a destroyed object"
;
return
native_o
(
this
.
nativeRef
,
o
);
}
private
native
Color
native_o
(
long
_nativeRef
,
Color
o
);
@Override
public
ArrayList
<
Color
>
l
(
ArrayList
<
Color
>
l
)
{
assert
!
this
.
destroyed
.
get
()
:
"trying to use a destroyed object"
;
return
native_l
(
this
.
nativeRef
,
l
);
}
private
native
ArrayList
<
Color
>
native_l
(
long
_nativeRef
,
ArrayList
<
Color
>
l
);
@Override
public
HashSet
<
Color
>
s
(
HashSet
<
Color
>
s
)
{
assert
!
this
.
destroyed
.
get
()
:
"trying to use a destroyed object"
;
return
native_s
(
this
.
nativeRef
,
s
);
}
private
native
HashSet
<
Color
>
native_s
(
long
_nativeRef
,
HashSet
<
Color
>
s
);
@Override
public
HashMap
<
Color
,
Color
>
m
(
HashMap
<
Color
,
Color
>
m
)
{
assert
!
this
.
destroyed
.
get
()
:
"trying to use a destroyed object"
;
return
native_m
(
this
.
nativeRef
,
m
);
}
private
native
HashMap
<
Color
,
Color
>
native_m
(
long
_nativeRef
,
HashMap
<
Color
,
Color
>
m
);
}
}
test-suite/generated-src/java/com/dropbox/djinni/test/EnumUsageRecord.java
0 → 100644
View file @
3a24d6fc
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from enum.djinni
package
com.dropbox.djinni.test
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.HashSet
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
public
class
EnumUsageRecord
{
/*package*/
final
Color
mE
;
/*package*/
final
Color
mO
;
/*package*/
final
ArrayList
<
Color
>
mL
;
/*package*/
final
HashSet
<
Color
>
mS
;
/*package*/
final
HashMap
<
Color
,
Color
>
mM
;
public
EnumUsageRecord
(
@Nonnull
Color
e
,
@CheckForNull
Color
o
,
@Nonnull
ArrayList
<
Color
>
l
,
@Nonnull
HashSet
<
Color
>
s
,
@Nonnull
HashMap
<
Color
,
Color
>
m
)
{
this
.
mE
=
e
;
this
.
mO
=
o
;
this
.
mL
=
l
;
this
.
mS
=
s
;
this
.
mM
=
m
;
}
@Nonnull
public
Color
getE
()
{
return
mE
;
}
@CheckForNull
public
Color
getO
()
{
return
mO
;
}
@Nonnull
public
ArrayList
<
Color
>
getL
()
{
return
mL
;
}
@Nonnull
public
HashSet
<
Color
>
getS
()
{
return
mS
;
}
@Nonnull
public
HashMap
<
Color
,
Color
>
getM
()
{
return
mM
;
}
@Override
public
String
toString
()
{
return
"EnumUsageRecord{"
+
"mE="
+
mE
+
","
+
"mO="
+
mO
+
","
+
"mL="
+
mL
+
","
+
"mS="
+
mS
+
","
+
"mM="
+
mM
+
"}"
;
}
}
test-suite/generated-src/java/com/dropbox/djinni/test/OptColorRecord.java
deleted
100644 → 0
View file @
f4ce7601
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from enum.djinni
package
com.dropbox.djinni.test
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
public
class
OptColorRecord
{
/*package*/
final
Color
mMyColor
;
public
OptColorRecord
(
@CheckForNull
Color
myColor
)
{
this
.
mMyColor
=
myColor
;
}
@CheckForNull
public
Color
getMyColor
()
{
return
mMyColor
;
}
@Override
public
String
toString
()
{
return
"OptColorRecord{"
+
"mMyColor="
+
mMyColor
+
"}"
;
}
}
test-suite/generated-src/jni/NativeEnumUsageInterface.cpp
0 → 100644
View file @
3a24d6fc
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from enum.djinni
#include "NativeEnumUsageInterface.hpp" // my header
#include "Marshal.hpp"
#include "NativeColor.hpp"
namespace
djinni_generated
{
NativeEnumUsageInterface
::
NativeEnumUsageInterface
()
:
::
djinni
::
JniInterface
<::
testsuite
::
EnumUsageInterface
,
NativeEnumUsageInterface
>
(
"com/dropbox/djinni/test/EnumUsageInterface$CppProxy"
)
{}
NativeEnumUsageInterface
::~
NativeEnumUsageInterface
()
=
default
;
NativeEnumUsageInterface
::
JavaProxy
::
JavaProxy
(
JniType
j
)
:
Handle
(
::
djinni
::
jniGetThreadEnv
(),
j
)
{
}
NativeEnumUsageInterface
::
JavaProxy
::~
JavaProxy
()
=
default
;
::
testsuite
::
color
NativeEnumUsageInterface
::
JavaProxy
::
e
(
::
testsuite
::
color
c_e
)
{
auto
jniEnv
=
::
djinni
::
jniGetThreadEnv
();
::
djinni
::
JniLocalScope
jscope
(
jniEnv
,
10
);
const
auto
&
data
=
::
djinni
::
JniClass
<::
djinni_generated
::
NativeEnumUsageInterface
>::
get
();
auto
jret
=
jniEnv
->
CallObjectMethod
(
Handle
::
get
().
get
(),
data
.
method_e
,
::
djinni
::
get
(
::
djinni_generated
::
NativeColor
::
fromCpp
(
jniEnv
,
c_e
)));
::
djinni
::
jniExceptionCheck
(
jniEnv
);
return
::
djinni_generated
::
NativeColor
::
toCpp
(
jniEnv
,
jret
);
}
std
::
experimental
::
optional
<::
testsuite
::
color
>
NativeEnumUsageInterface
::
JavaProxy
::
o
(
std
::
experimental
::
optional
<::
testsuite
::
color
>
c_o
)
{
auto
jniEnv
=
::
djinni
::
jniGetThreadEnv
();
::
djinni
::
JniLocalScope
jscope
(
jniEnv
,
10
);
const
auto
&
data
=
::
djinni
::
JniClass
<::
djinni_generated
::
NativeEnumUsageInterface
>::
get
();
auto
jret
=
jniEnv
->
CallObjectMethod
(
Handle
::
get
().
get
(),
data
.
method_o
,
::
djinni
::
get
(
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni_generated
::
NativeColor
>::
fromCpp
(
jniEnv
,
c_o
)));
::
djinni
::
jniExceptionCheck
(
jniEnv
);
return
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni_generated
::
NativeColor
>::
toCpp
(
jniEnv
,
jret
);
}
std
::
vector
<::
testsuite
::
color
>
NativeEnumUsageInterface
::
JavaProxy
::
l
(
const
std
::
vector
<::
testsuite
::
color
>
&
c_l
)
{
auto
jniEnv
=
::
djinni
::
jniGetThreadEnv
();
::
djinni
::
JniLocalScope
jscope
(
jniEnv
,
10
);
const
auto
&
data
=
::
djinni
::
JniClass
<::
djinni_generated
::
NativeEnumUsageInterface
>::
get
();
auto
jret
=
jniEnv
->
CallObjectMethod
(
Handle
::
get
().
get
(),
data
.
method_l
,
::
djinni
::
get
(
::
djinni
::
List
<::
djinni_generated
::
NativeColor
>::
fromCpp
(
jniEnv
,
c_l
)));
::
djinni
::
jniExceptionCheck
(
jniEnv
);
return
::
djinni
::
List
<::
djinni_generated
::
NativeColor
>::
toCpp
(
jniEnv
,
jret
);
}
std
::
unordered_set
<::
testsuite
::
color
>
NativeEnumUsageInterface
::
JavaProxy
::
s
(
const
std
::
unordered_set
<::
testsuite
::
color
>
&
c_s
)
{
auto
jniEnv
=
::
djinni
::
jniGetThreadEnv
();
::
djinni
::
JniLocalScope
jscope
(
jniEnv
,
10
);
const
auto
&
data
=
::
djinni
::
JniClass
<::
djinni_generated
::
NativeEnumUsageInterface
>::
get
();
auto
jret
=
jniEnv
->
CallObjectMethod
(
Handle
::
get
().
get
(),
data
.
method_s
,
::
djinni
::
get
(
::
djinni
::
Set
<::
djinni_generated
::
NativeColor
>::
fromCpp
(
jniEnv
,
c_s
)));
::
djinni
::
jniExceptionCheck
(
jniEnv
);
return
::
djinni
::
Set
<::
djinni_generated
::
NativeColor
>::
toCpp
(
jniEnv
,
jret
);
}
std
::
unordered_map
<::
testsuite
::
color
,
::
testsuite
::
color
>
NativeEnumUsageInterface
::
JavaProxy
::
m
(
const
std
::
unordered_map
<::
testsuite
::
color
,
::
testsuite
::
color
>
&
c_m
)
{
auto
jniEnv
=
::
djinni
::
jniGetThreadEnv
();
::
djinni
::
JniLocalScope
jscope
(
jniEnv
,
10
);
const
auto
&
data
=
::
djinni
::
JniClass
<::
djinni_generated
::
NativeEnumUsageInterface
>::
get
();
auto
jret
=
jniEnv
->
CallObjectMethod
(
Handle
::
get
().
get
(),
data
.
method_m
,
::
djinni
::
get
(
::
djinni
::
Map
<::
djinni_generated
::
NativeColor
,
::
djinni_generated
::
NativeColor
>::
fromCpp
(
jniEnv
,
c_m
)));
::
djinni
::
jniExceptionCheck
(
jniEnv
);
return
::
djinni
::
Map
<::
djinni_generated
::
NativeColor
,
::
djinni_generated
::
NativeColor
>::
toCpp
(
jniEnv
,
jret
);
}
CJNIEXPORT
void
JNICALL
Java_com_dropbox_djinni_test_EnumUsageInterface_00024CppProxy_nativeDestroy
(
JNIEnv
*
jniEnv
,
jobject
/*this*/
,
jlong
nativeRef
)
{
try
{
DJINNI_FUNCTION_PROLOGUE1
(
jniEnv
,
nativeRef
);
delete
reinterpret_cast
<::
djinni
::
CppProxyHandle
<::
testsuite
::
EnumUsageInterface
>*>
(
nativeRef
);
}
JNI_TRANSLATE_EXCEPTIONS_RETURN
(
jniEnv
,
)
}
CJNIEXPORT
jobject
JNICALL
Java_com_dropbox_djinni_test_EnumUsageInterface_00024CppProxy_native_1e
(
JNIEnv
*
jniEnv
,
jobject
/*this*/
,
jlong
nativeRef
,
jobject
j_e
)
{
try
{
DJINNI_FUNCTION_PROLOGUE1
(
jniEnv
,
nativeRef
);
const
auto
&
ref
=
::
djinni
::
objectFromHandleAddress
<::
testsuite
::
EnumUsageInterface
>
(
nativeRef
);
auto
r
=
ref
->
e
(
::
djinni_generated
::
NativeColor
::
toCpp
(
jniEnv
,
j_e
));
return
::
djinni
::
release
(
::
djinni_generated
::
NativeColor
::
fromCpp
(
jniEnv
,
r
));
}
JNI_TRANSLATE_EXCEPTIONS_RETURN
(
jniEnv
,
0
/* value doesn't matter */
)
}
CJNIEXPORT
jobject
JNICALL
Java_com_dropbox_djinni_test_EnumUsageInterface_00024CppProxy_native_1o
(
JNIEnv
*
jniEnv
,
jobject
/*this*/
,
jlong
nativeRef
,
jobject
j_o
)
{
try
{
DJINNI_FUNCTION_PROLOGUE1
(
jniEnv
,
nativeRef
);
const
auto
&
ref
=
::
djinni
::
objectFromHandleAddress
<::
testsuite
::
EnumUsageInterface
>
(
nativeRef
);
auto
r
=
ref
->
o
(
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni_generated
::
NativeColor
>::
toCpp
(
jniEnv
,
j_o
));
return
::
djinni
::
release
(
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni_generated
::
NativeColor
>::
fromCpp
(
jniEnv
,
r
));
}
JNI_TRANSLATE_EXCEPTIONS_RETURN
(
jniEnv
,
0
/* value doesn't matter */
)
}
CJNIEXPORT
jobject
JNICALL
Java_com_dropbox_djinni_test_EnumUsageInterface_00024CppProxy_native_1l
(
JNIEnv
*
jniEnv
,
jobject
/*this*/
,
jlong
nativeRef
,
jobject
j_l
)
{
try
{
DJINNI_FUNCTION_PROLOGUE1
(
jniEnv
,
nativeRef
);
const
auto
&
ref
=
::
djinni
::
objectFromHandleAddress
<::
testsuite
::
EnumUsageInterface
>
(
nativeRef
);
auto
r
=
ref
->
l
(
::
djinni
::
List
<::
djinni_generated
::
NativeColor
>::
toCpp
(
jniEnv
,
j_l
));
return
::
djinni
::
release
(
::
djinni
::
List
<::
djinni_generated
::
NativeColor
>::
fromCpp
(
jniEnv
,
r
));
}
JNI_TRANSLATE_EXCEPTIONS_RETURN
(
jniEnv
,
0
/* value doesn't matter */
)
}
CJNIEXPORT
jobject
JNICALL
Java_com_dropbox_djinni_test_EnumUsageInterface_00024CppProxy_native_1s
(
JNIEnv
*
jniEnv
,
jobject
/*this*/
,
jlong
nativeRef
,
jobject
j_s
)
{
try
{
DJINNI_FUNCTION_PROLOGUE1
(
jniEnv
,
nativeRef
);
const
auto
&
ref
=
::
djinni
::
objectFromHandleAddress
<::
testsuite
::
EnumUsageInterface
>
(
nativeRef
);
auto
r
=
ref
->
s
(
::
djinni
::
Set
<::
djinni_generated
::
NativeColor
>::
toCpp
(
jniEnv
,
j_s
));
return
::
djinni
::
release
(
::
djinni
::
Set
<::
djinni_generated
::
NativeColor
>::
fromCpp
(
jniEnv
,
r
));
}
JNI_TRANSLATE_EXCEPTIONS_RETURN
(
jniEnv
,
0
/* value doesn't matter */
)
}
CJNIEXPORT
jobject
JNICALL
Java_com_dropbox_djinni_test_EnumUsageInterface_00024CppProxy_native_1m
(
JNIEnv
*
jniEnv
,
jobject
/*this*/
,
jlong
nativeRef
,
jobject
j_m
)
{
try
{
DJINNI_FUNCTION_PROLOGUE1
(
jniEnv
,
nativeRef
);
const
auto
&
ref
=
::
djinni
::
objectFromHandleAddress
<::
testsuite
::
EnumUsageInterface
>
(
nativeRef
);
auto
r
=
ref
->
m
(
::
djinni
::
Map
<::
djinni_generated
::
NativeColor
,
::
djinni_generated
::
NativeColor
>::
toCpp
(
jniEnv
,
j_m
));
return
::
djinni
::
release
(
::
djinni
::
Map
<::
djinni_generated
::
NativeColor
,
::
djinni_generated
::
NativeColor
>::
fromCpp
(
jniEnv
,
r
));
}
JNI_TRANSLATE_EXCEPTIONS_RETURN
(
jniEnv
,
0
/* value doesn't matter */
)
}
}
// namespace djinni_generated
test-suite/generated-src/jni/NativeEnumUsageInterface.hpp
0 → 100644
View file @
3a24d6fc
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from enum.djinni
#pragma once
#include "djinni_support.hpp"
#include "enum_usage_interface.hpp"
namespace
djinni_generated
{
class
NativeEnumUsageInterface
final
:
::
djinni
::
JniInterface
<::
testsuite
::
EnumUsageInterface
,
NativeEnumUsageInterface
>
{
public:
using
CppType
=
std
::
shared_ptr
<::
testsuite
::
EnumUsageInterface
>
;
using
CppOptType
=
std
::
shared_ptr
<::
testsuite
::
EnumUsageInterface
>
;
using
JniType
=
jobject
;
using
Boxed
=
NativeEnumUsageInterface
;
~
NativeEnumUsageInterface
();
static
CppType
toCpp
(
JNIEnv
*
jniEnv
,
JniType
j
)
{
return
::
djinni
::
JniClass
<
NativeEnumUsageInterface
>::
get
().
_fromJava
(
jniEnv
,
j
);
}
static
::
djinni
::
LocalRef
<
JniType
>
fromCppOpt
(
JNIEnv
*
jniEnv
,
const
CppOptType
&
c
)
{
return
{
jniEnv
,
::
djinni
::
JniClass
<
NativeEnumUsageInterface
>::
get
().
_toJava
(
jniEnv
,
c
)};
}
static
::
djinni
::
LocalRef
<
JniType
>
fromCpp
(
JNIEnv
*
jniEnv
,
const
CppType
&
c
)
{
return
fromCppOpt
(
jniEnv
,
c
);
}
private:
NativeEnumUsageInterface
();
friend
::
djinni
::
JniClass
<
NativeEnumUsageInterface
>
;
friend
::
djinni
::
JniInterface
<::
testsuite
::
EnumUsageInterface
,
NativeEnumUsageInterface
>
;
class
JavaProxy
final
:
::
djinni
::
JavaProxyHandle
<
JavaProxy
>
,
public
::
testsuite
::
EnumUsageInterface
{
public:
JavaProxy
(
JniType
j
);
~
JavaProxy
();
::
testsuite
::
color
e
(
::
testsuite
::
color
e
)
override
;
std
::
experimental
::
optional
<::
testsuite
::
color
>
o
(
std
::
experimental
::
optional
<::
testsuite
::
color
>
o
)
override
;
std
::
vector
<::
testsuite
::
color
>
l
(
const
std
::
vector
<::
testsuite
::
color
>
&
l
)
override
;
std
::
unordered_set
<::
testsuite
::
color
>
s
(
const
std
::
unordered_set
<::
testsuite
::
color
>
&
s
)
override
;
std
::
unordered_map
<::
testsuite
::
color
,
::
testsuite
::
color
>
m
(
const
std
::
unordered_map
<::
testsuite
::
color
,
::
testsuite
::
color
>
&
m
)
override
;
private:
friend
::
djinni
::
JniInterface
<::
testsuite
::
EnumUsageInterface
,
::
djinni_generated
::
NativeEnumUsageInterface
>
;
};
const
::
djinni
::
GlobalRef
<
jclass
>
clazz
{
::
djinni
::
jniFindClass
(
"com/dropbox/djinni/test/EnumUsageInterface"
)
};
const
jmethodID
method_e
{
::
djinni
::
jniGetMethodID
(
clazz
.
get
(),
"e"
,
"(Lcom/dropbox/djinni/test/Color;)Lcom/dropbox/djinni/test/Color;"
)
};
const
jmethodID
method_o
{
::
djinni
::
jniGetMethodID
(
clazz
.
get
(),
"o"
,
"(Lcom/dropbox/djinni/test/Color;)Lcom/dropbox/djinni/test/Color;"
)
};
const
jmethodID
method_l
{
::
djinni
::
jniGetMethodID
(
clazz
.
get
(),
"l"
,
"(Ljava/util/ArrayList;)Ljava/util/ArrayList;"
)
};
const
jmethodID
method_s
{
::
djinni
::
jniGetMethodID
(
clazz
.
get
(),
"s"
,
"(Ljava/util/HashSet;)Ljava/util/HashSet;"
)
};
const
jmethodID
method_m
{
::
djinni
::
jniGetMethodID
(
clazz
.
get
(),
"m"
,
"(Ljava/util/HashMap;)Ljava/util/HashMap;"
)
};
};
}
// namespace djinni_generated
test-suite/generated-src/jni/NativeEnumUsageRecord.cpp
0 → 100644
View file @
3a24d6fc
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from enum.djinni
#include "NativeEnumUsageRecord.hpp" // my header
#include "Marshal.hpp"
#include "NativeColor.hpp"
namespace
djinni_generated
{
NativeEnumUsageRecord
::
NativeEnumUsageRecord
()
=
default
;
NativeEnumUsageRecord
::~
NativeEnumUsageRecord
()
=
default
;
auto
NativeEnumUsageRecord
::
fromCpp
(
JNIEnv
*
jniEnv
,
const
CppType
&
c
)
->
::
djinni
::
LocalRef
<
JniType
>
{
const
auto
&
data
=
::
djinni
::
JniClass
<
NativeEnumUsageRecord
>::
get
();
auto
r
=
::
djinni
::
LocalRef
<
JniType
>
{
jniEnv
->
NewObject
(
data
.
clazz
.
get
(),
data
.
jconstructor
,
::
djinni
::
get
(
::
djinni_generated
::
NativeColor
::
fromCpp
(
jniEnv
,
c
.
e
)),
::
djinni
::
get
(
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni_generated
::
NativeColor
>::
fromCpp
(
jniEnv
,
c
.
o
)),
::
djinni
::
get
(
::
djinni
::
List
<::
djinni_generated
::
NativeColor
>::
fromCpp
(
jniEnv
,
c
.
l
)),
::
djinni
::
get
(
::
djinni
::
Set
<::
djinni_generated
::
NativeColor
>::
fromCpp
(
jniEnv
,
c
.
s
)),
::
djinni
::
get
(
::
djinni
::
Map
<::
djinni_generated
::
NativeColor
,
::
djinni_generated
::
NativeColor
>::
fromCpp
(
jniEnv
,
c
.
m
)))};
::
djinni
::
jniExceptionCheck
(
jniEnv
);
return
r
;
}
auto
NativeEnumUsageRecord
::
toCpp
(
JNIEnv
*
jniEnv
,
JniType
j
)
->
CppType
{
::
djinni
::
JniLocalScope
jscope
(
jniEnv
,
6
);
assert
(
j
!=
nullptr
);
const
auto
&
data
=
::
djinni
::
JniClass
<
NativeEnumUsageRecord
>::
get
();
return
{
::
djinni_generated
::
NativeColor
::
toCpp
(
jniEnv
,
jniEnv
->
GetObjectField
(
j
,
data
.
field_mE
)),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni_generated
::
NativeColor
>::
toCpp
(
jniEnv
,
jniEnv
->
GetObjectField
(
j
,
data
.
field_mO
)),
::
djinni
::
List
<::
djinni_generated
::
NativeColor
>::
toCpp
(
jniEnv
,
jniEnv
->
GetObjectField
(
j
,
data
.
field_mL
)),
::
djinni
::
Set
<::
djinni_generated
::
NativeColor
>::
toCpp
(
jniEnv
,
jniEnv
->
GetObjectField
(
j
,
data
.
field_mS
)),
::
djinni
::
Map
<::
djinni_generated
::
NativeColor
,
::
djinni_generated
::
NativeColor
>::
toCpp
(
jniEnv
,
jniEnv
->
GetObjectField
(
j
,
data
.
field_mM
))};
}
}
// namespace djinni_generated
test-suite/generated-src/jni/Native
OptColor
Record.hpp
→
test-suite/generated-src/jni/Native
EnumUsage
Record.hpp
View file @
3a24d6fc
...
...
@@ -4,29 +4,33 @@
#pragma once
#include "djinni_support.hpp"
#include "
opt_color
_record.hpp"
#include "
enum_usage
_record.hpp"
namespace
djinni_generated
{
class
Native
OptColor
Record
final
{
class
Native
EnumUsage
Record
final
{
public:
using
CppType
=
::
testsuite
::
OptColor
Record
;
using
CppType
=
::
testsuite
::
EnumUsage
Record
;
using
JniType
=
jobject
;
using
Boxed
=
Native
OptColor
Record
;
using
Boxed
=
Native
EnumUsage
Record
;
~
Native
OptColor
Record
();
~
Native
EnumUsage
Record
();
static
CppType
toCpp
(
JNIEnv
*
jniEnv
,
JniType
j
);
static
::
djinni
::
LocalRef
<
JniType
>
fromCpp
(
JNIEnv
*
jniEnv
,
const
CppType
&
c
);
private:
NativeOptColorRecord
();
friend
::
djinni
::
JniClass
<
NativeOptColorRecord
>
;
const
::
djinni
::
GlobalRef
<
jclass
>
clazz
{
::
djinni
::
jniFindClass
(
"com/dropbox/djinni/test/OptColorRecord"
)
};
const
jmethodID
jconstructor
{
::
djinni
::
jniGetMethodID
(
clazz
.
get
(),
"<init>"
,
"(Lcom/dropbox/djinni/test/Color;)V"
)
};
const
jfieldID
field_mMyColor
{
::
djinni
::
jniGetFieldID
(
clazz
.
get
(),
"mMyColor"
,
"Lcom/dropbox/djinni/test/Color;"
)
};
NativeEnumUsageRecord
();
friend
::
djinni
::
JniClass
<
NativeEnumUsageRecord
>
;
const
::
djinni
::
GlobalRef
<
jclass
>
clazz
{
::
djinni
::
jniFindClass
(
"com/dropbox/djinni/test/EnumUsageRecord"
)
};
const
jmethodID
jconstructor
{
::
djinni
::
jniGetMethodID
(
clazz
.
get
(),
"<init>"
,
"(Lcom/dropbox/djinni/test/Color;Lcom/dropbox/djinni/test/Color;Ljava/util/ArrayList;Ljava/util/HashSet;Ljava/util/HashMap;)V"
)
};
const
jfieldID
field_mE
{
::
djinni
::
jniGetFieldID
(
clazz
.
get
(),
"mE"
,
"Lcom/dropbox/djinni/test/Color;"
)
};
const
jfieldID
field_mO
{
::
djinni
::
jniGetFieldID
(
clazz
.
get
(),
"mO"
,
"Lcom/dropbox/djinni/test/Color;"
)
};
const
jfieldID
field_mL
{
::
djinni
::
jniGetFieldID
(
clazz
.
get
(),
"mL"
,
"Ljava/util/ArrayList;"
)
};
const
jfieldID
field_mS
{
::
djinni
::
jniGetFieldID
(
clazz
.
get
(),
"mS"
,
"Ljava/util/HashSet;"
)
};
const
jfieldID
field_mM
{
::
djinni
::
jniGetFieldID
(
clazz
.
get
(),
"mM"
,
"Ljava/util/HashMap;"
)
};
};
}
// namespace djinni_generated
test-suite/generated-src/jni/NativeOptColorRecord.cpp
deleted
100644 → 0
View file @
f4ce7601
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from enum.djinni
#include "NativeOptColorRecord.hpp" // my header
#include "Marshal.hpp"
#include "NativeColor.hpp"
namespace
djinni_generated
{
NativeOptColorRecord
::
NativeOptColorRecord
()
=
default
;
NativeOptColorRecord
::~
NativeOptColorRecord
()
=
default
;
auto
NativeOptColorRecord
::
fromCpp
(
JNIEnv
*
jniEnv
,
const
CppType
&
c
)
->
::
djinni
::
LocalRef
<
JniType
>
{
const
auto
&
data
=
::
djinni
::
JniClass
<
NativeOptColorRecord
>::
get
();
auto
r
=
::
djinni
::
LocalRef
<
JniType
>
{
jniEnv
->
NewObject
(
data
.
clazz
.
get
(),
data
.
jconstructor
,
::
djinni
::
get
(
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni_generated
::
NativeColor
>::
fromCpp
(
jniEnv
,
c
.
my_color
)))};
::
djinni
::
jniExceptionCheck
(
jniEnv
);
return
r
;
}
auto
NativeOptColorRecord
::
toCpp
(
JNIEnv
*
jniEnv
,
JniType
j
)
->
CppType
{
::
djinni
::
JniLocalScope
jscope
(
jniEnv
,
2
);
assert
(
j
!=
nullptr
);
const
auto
&
data
=
::
djinni
::
JniClass
<
NativeOptColorRecord
>::
get
();
return
{
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni_generated
::
NativeColor
>::
toCpp
(
jniEnv
,
jniEnv
->
GetObjectField
(
j
,
data
.
field_mMyColor
))};
}
}
// namespace djinni_generated
test-suite/generated-src/objc/DBColor+Private.h
0 → 100644
View file @
3a24d6fc
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from enum.djinni
#include "color.hpp"
#import "DJIMarshal+Private.h"
test-suite/generated-src/objc/DBEnumUsageInterface+Private.h
0 → 100644
View file @
3a24d6fc
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from enum.djinni
#include "enum_usage_interface.hpp"
#include <memory>
static_assert
(
__has_feature
(
objc_arc
),
"Djinni requires ARC to be enabled for this file"
);
@protocol
DBEnumUsageInterface
;
namespace
djinni_generated
{
class
EnumUsageInterface
{
public:
using
CppType
=
std
::
shared_ptr
<::
testsuite
::
EnumUsageInterface
>
;
using
CppOptType
=
std
::
shared_ptr
<::
testsuite
::
EnumUsageInterface
>
;
using
ObjcType
=
id
<
DBEnumUsageInterface
>
;
using
Boxed
=
EnumUsageInterface
;
static
CppType
toCpp
(
ObjcType
objc
);
static
ObjcType
fromCppOpt
(
const
CppOptType
&
cpp
);
static
ObjcType
fromCpp
(
const
CppType
&
cpp
)
{
return
fromCppOpt
(
cpp
);
}
private:
class
ObjcProxy
;
};
}
// namespace djinni_generated
test-suite/generated-src/objc/DBEnumUsageInterface+Private.mm
0 → 100644
View file @
3a24d6fc
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from enum.djinni
#import "DBEnumUsageInterface+Private.h"
#import "DBEnumUsageInterface.h"
#import "DBColor+Private.h"
#import "DJICppWrapperCache+Private.h"
#import "DJIError.h"
#import "DJIMarshal+Private.h"
#import "DJIObjcWrapperCache+Private.h"
#include <exception>
#include <utility>
static_assert
(
__has_feature
(
objc_arc
),
"Djinni requires ARC to be enabled for this file"
);
@interface
DBEnumUsageInterfaceCppProxy
:
NSObject
<
DBEnumUsageInterface
>
-
(
id
)
initWithCpp
:(
const
std
::
shared_ptr
<::
testsuite
::
EnumUsageInterface
>&
)
cppRef
;
@end
@implementation
DBEnumUsageInterfaceCppProxy
{
::
djinni
::
CppProxyCache
::
Handle
<
std
::
shared_ptr
<::
testsuite
::
EnumUsageInterface
>>
_cppRefHandle
;
}
-
(
id
)
initWithCpp
:(
const
std
::
shared_ptr
<::
testsuite
::
EnumUsageInterface
>&
)
cppRef
{
if
(
self
=
[
super
init
])
{
_cppRefHandle
.
assign
(
cppRef
);
}
return
self
;
}
-
(
DBColor
)
e
:(
DBColor
)
e
{
try
{
auto
r
=
_cppRefHandle
.
get
()
->
e
(
::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>::
toCpp
(
e
));
return
::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>::
fromCpp
(
r
);
}
DJINNI_TRANSLATE_EXCEPTIONS
()
}
-
(
nullable
NSNumber
*
)
o
:(
nullable
NSNumber
*
)
o
{
try
{
auto
r
=
_cppRefHandle
.
get
()
->
o
(
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>>::
toCpp
(
o
));
return
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>>::
fromCpp
(
r
);
}
DJINNI_TRANSLATE_EXCEPTIONS
()
}
-
(
nonnull
NSArray
<
NSNumber
*>
*
)
l
:(
nonnull
NSArray
<
NSNumber
*>
*
)
l
{
try
{
auto
r
=
_cppRefHandle
.
get
()
->
l
(
::
djinni
::
List
<::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>>::
toCpp
(
l
));
return
::
djinni
::
List
<::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>>::
fromCpp
(
r
);
}
DJINNI_TRANSLATE_EXCEPTIONS
()
}
-
(
nonnull
NSSet
<
NSNumber
*>
*
)
s
:(
nonnull
NSSet
<
NSNumber
*>
*
)
s
{
try
{
auto
r
=
_cppRefHandle
.
get
()
->
s
(
::
djinni
::
Set
<::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>>::
toCpp
(
s
));
return
::
djinni
::
Set
<::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>>::
fromCpp
(
r
);
}
DJINNI_TRANSLATE_EXCEPTIONS
()
}
-
(
nonnull
NSDictionary
<
NSNumber
*
,
NSNumber
*>
*
)
m
:(
nonnull
NSDictionary
<
NSNumber
*
,
NSNumber
*>
*
)
m
{
try
{
auto
r
=
_cppRefHandle
.
get
()
->
m
(
::
djinni
::
Map
<::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>
,
::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>>::
toCpp
(
m
));
return
::
djinni
::
Map
<::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>
,
::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>>::
fromCpp
(
r
);
}
DJINNI_TRANSLATE_EXCEPTIONS
()
}
namespace
djinni_generated
{
class
EnumUsageInterface
::
ObjcProxy
final
:
public
::
testsuite
::
EnumUsageInterface
,
public
::
djinni
::
ObjcProxyCache
::
Handle
<
ObjcType
>
{
public:
using
Handle
::
Handle
;
::
testsuite
::
color
e
(
::
testsuite
::
color
c_e
)
override
{
@autoreleasepool
{
auto
r
=
[
Handle
:
:
get
()
e
:(
::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>::
fromCpp
(
c_e
))];
return
::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>::
toCpp
(
r
);
}
}
std
::
experimental
::
optional
<::
testsuite
::
color
>
o
(
std
::
experimental
::
optional
<::
testsuite
::
color
>
c_o
)
override
{
@autoreleasepool
{
auto
r
=
[
Handle
:
:
get
()
o
:(
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>>::
fromCpp
(
c_o
))];
return
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>>::
toCpp
(
r
);
}
}
std
::
vector
<::
testsuite
::
color
>
l
(
const
std
::
vector
<::
testsuite
::
color
>
&
c_l
)
override
{
@autoreleasepool
{
auto
r
=
[
Handle
:
:
get
()
l
:(
::
djinni
::
List
<::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>>::
fromCpp
(
c_l
))];
return
::
djinni
::
List
<::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>>::
toCpp
(
r
);
}
}
std
::
unordered_set
<::
testsuite
::
color
>
s
(
const
std
::
unordered_set
<::
testsuite
::
color
>
&
c_s
)
override
{
@autoreleasepool
{
auto
r
=
[
Handle
:
:
get
()
s
:(
::
djinni
::
Set
<::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>>::
fromCpp
(
c_s
))];
return
::
djinni
::
Set
<::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>>::
toCpp
(
r
);
}
}
std
::
unordered_map
<::
testsuite
::
color
,
::
testsuite
::
color
>
m
(
const
std
::
unordered_map
<::
testsuite
::
color
,
::
testsuite
::
color
>
&
c_m
)
override
{
@autoreleasepool
{
auto
r
=
[
Handle
:
:
get
()
m
:(
::
djinni
::
Map
<::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>
,
::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>>::
fromCpp
(
c_m
))];
return
::
djinni
::
Map
<::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>
,
::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>>::
toCpp
(
r
);
}
}
};
}
// namespace djinni_generated
namespace
djinni_generated
{
auto
EnumUsageInterface
::
toCpp
(
ObjcType
objc
)
->
CppType
{
if
(
!
objc
)
{
return
nullptr
;
}
if
([(
id
)
objc
isKindOfClass
:[
DBEnumUsageInterfaceCppProxy
class
]])
{
return
((
DBEnumUsageInterfaceCppProxy
*
)
objc
)
->
_cppRefHandle
.
get
();
}
return
::
djinni
::
get_objc_proxy
<
ObjcProxy
>
(
objc
);
}
auto
EnumUsageInterface
::
fromCppOpt
(
const
CppOptType
&
cpp
)
->
ObjcType
{
if
(
!
cpp
)
{
return
nil
;
}
if
(
auto
cppPtr
=
dynamic_cast
<
ObjcProxy
*>
(
cpp
.
get
()))
{
return
cppPtr
->
Handle
::
get
();
}
return
::
djinni
::
get_cpp_proxy
<
DBEnumUsageInterfaceCppProxy
>
(
cpp
);
}
}
// namespace djinni_generated
@end
test-suite/generated-src/objc/DB
OptColorRecord
.h
→
test-suite/generated-src/objc/DB
EnumUsageInterface
.h
View file @
3a24d6fc
...
...
@@ -4,10 +4,17 @@
#import "DBColor.h"
#import <Foundation/Foundation.h>
@interface
DBOptColorRecord
:
NSObject
-
(
nonnull
instancetype
)
initWithMyColor
:(
nullable
NSNumber
*
)
myColor
;
+
(
nonnull
instancetype
)
optColorRecordWithMyColor
:(
nullable
NSNumber
*
)
myColor
;
@property
(
nonatomic
,
readonly
,
nullable
)
NSNumber
*
myColor
;
@protocol
DBEnumUsageInterface
-
(
DBColor
)
e
:(
DBColor
)
e
;
-
(
nullable
NSNumber
*
)
o
:(
nullable
NSNumber
*
)
o
;
-
(
nonnull
NSArray
<
NSNumber
*>
*
)
l
:(
nonnull
NSArray
<
NSNumber
*>
*
)
l
;
-
(
nonnull
NSSet
<
NSNumber
*>
*
)
s
:(
nonnull
NSSet
<
NSNumber
*>
*
)
s
;
-
(
nonnull
NSDictionary
<
NSNumber
*
,
NSNumber
*>
*
)
m
:(
nonnull
NSDictionary
<
NSNumber
*
,
NSNumber
*>
*
)
m
;
@end
test-suite/generated-src/objc/DB
OptColor
Record+Private.h
→
test-suite/generated-src/objc/DB
EnumUsage
Record+Private.h
View file @
3a24d6fc
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from enum.djinni
#import "DB
OptColor
Record.h"
#include "
opt_color
_record.hpp"
#import "DB
EnumUsage
Record.h"
#include "
enum_usage
_record.hpp"
static_assert
(
__has_feature
(
objc_arc
),
"Djinni requires ARC to be enabled for this file"
);
@
class
DB
OptColor
Record
;
@
class
DB
EnumUsage
Record
;
namespace
djinni_generated
{
struct
OptColor
Record
struct
EnumUsage
Record
{
using
CppType
=
::
testsuite
::
OptColor
Record
;
using
ObjcType
=
DB
OptColor
Record
*
;
using
CppType
=
::
testsuite
::
EnumUsage
Record
;
using
ObjcType
=
DB
EnumUsage
Record
*
;
using
Boxed
=
OptColor
Record
;
using
Boxed
=
EnumUsage
Record
;
static
CppType
toCpp
(
ObjcType
objc
);
static
ObjcType
fromCpp
(
const
CppType
&
cpp
);
...
...
test-suite/generated-src/objc/DBEnumUsageRecord+Private.mm
0 → 100644
View file @
3a24d6fc
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from enum.djinni
#import "DBEnumUsageRecord+Private.h"
#import "DBColor+Private.h"
#import "DJIMarshal+Private.h"
#include <cassert>
namespace
djinni_generated
{
auto
EnumUsageRecord
::
toCpp
(
ObjcType
obj
)
->
CppType
{
assert
(
obj
);
return
{
::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>::
toCpp
(
obj
.
e
),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>>::
toCpp
(
obj
.
o
),
::
djinni
::
List
<::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>>::
toCpp
(
obj
.
l
),
::
djinni
::
Set
<::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>>::
toCpp
(
obj
.
s
),
::
djinni
::
Map
<::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>
,
::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>>::
toCpp
(
obj
.
m
)};
}
auto
EnumUsageRecord
::
fromCpp
(
const
CppType
&
cpp
)
->
ObjcType
{
return
[[
DBEnumUsageRecord
alloc
]
initWithE
:(
::
djinni
:
:
Enum
<::
testsuite
::
color
,
DBColor
>::
fromCpp
(
cpp
.
e
))
o:
(
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>>::
fromCpp
(
cpp
.
o
))
l:
(
::
djinni
::
List
<::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>>::
fromCpp
(
cpp
.
l
))
s:
(
::
djinni
::
Set
<::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>>::
fromCpp
(
cpp
.
s
))
m:
(
::
djinni
::
Map
<::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>
,
::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>>::
fromCpp
(
cpp
.
m
))];
}
}
// namespace djinni_generated
test-suite/generated-src/objc/DBEnumUsageRecord.h
0 → 100644
View file @
3a24d6fc
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from enum.djinni
#import "DBColor.h"
#import <Foundation/Foundation.h>
@interface
DBEnumUsageRecord
:
NSObject
-
(
nonnull
instancetype
)
initWithE
:(
DBColor
)
e
o
:(
nullable
NSNumber
*
)
o
l
:(
nonnull
NSArray
<
NSNumber
*>
*
)
l
s
:(
nonnull
NSSet
<
NSNumber
*>
*
)
s
m
:(
nonnull
NSDictionary
<
NSNumber
*
,
NSNumber
*>
*
)
m
;
+
(
nonnull
instancetype
)
enumUsageRecordWithE
:(
DBColor
)
e
o
:(
nullable
NSNumber
*
)
o
l
:(
nonnull
NSArray
<
NSNumber
*>
*
)
l
s
:(
nonnull
NSSet
<
NSNumber
*>
*
)
s
m
:(
nonnull
NSDictionary
<
NSNumber
*
,
NSNumber
*>
*
)
m
;
@property
(
nonatomic
,
readonly
)
DBColor
e
;
@property
(
nonatomic
,
readonly
,
nullable
)
NSNumber
*
o
;
@property
(
nonatomic
,
readonly
,
nonnull
)
NSArray
<
NSNumber
*>
*
l
;
@property
(
nonatomic
,
readonly
,
nonnull
)
NSSet
<
NSNumber
*>
*
s
;
@property
(
nonatomic
,
readonly
,
nonnull
)
NSDictionary
<
NSNumber
*
,
NSNumber
*>
*
m
;
@end
test-suite/generated-src/objc/DBEnumUsageRecord.mm
0 → 100644
View file @
3a24d6fc
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from enum.djinni
#import "DBEnumUsageRecord.h"
@implementation
DBEnumUsageRecord
-
(
nonnull
instancetype
)
initWithE
:(
DBColor
)
e
o
:(
nullable
NSNumber
*
)
o
l
:(
nonnull
NSArray
<
NSNumber
*>
*
)
l
s
:(
nonnull
NSSet
<
NSNumber
*>
*
)
s
m
:(
nonnull
NSDictionary
<
NSNumber
*
,
NSNumber
*>
*
)
m
{
if
(
self
=
[
super
init
])
{
_e
=
e
;
_o
=
o
;
_l
=
[
l
copy
];
_s
=
[
s
copy
];
_m
=
[
m
copy
];
}
return
self
;
}
+
(
nonnull
instancetype
)
enumUsageRecordWithE
:(
DBColor
)
e
o
:(
nullable
NSNumber
*
)
o
l
:(
nonnull
NSArray
<
NSNumber
*>
*
)
l
s
:(
nonnull
NSSet
<
NSNumber
*>
*
)
s
m
:(
nonnull
NSDictionary
<
NSNumber
*
,
NSNumber
*>
*
)
m
{
return
[[
self
alloc
]
initWithE
:
e
o:
o
l:
l
s:
s
m:
m
];
}
-
(
NSString
*
)
description
{
return
[
NSString
stringWithFormat
:
@"<%@ %p e:%@ o:%@ l:%@ s:%@ m:%@>"
,
self
.
class
,
(
void
*
)
self
,
@
(
self
.
e
),
self
.
o
,
self
.
l
,
self
.
s
,
self
.
m
];
}
@end
test-suite/generated-src/objc/DBExternRecordWithDerivings+Private.mm
View file @
3a24d6fc
...
...
@@ -2,8 +2,8 @@
// This file generated by Djinni from yaml-test.djinni
#import "DBExternRecordWithDerivings+Private.h"
#import "DBColor+Private.h"
#import "DBRecordWithDerivings+Private.h"
#import "DJIMarshal+Private.h"
#include <cassert>
namespace
djinni_generated
{
...
...
test-suite/generated-src/objc/DBOptColorRecord+Private.mm
deleted
100644 → 0
View file @
f4ce7601
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from enum.djinni
#import "DBOptColorRecord+Private.h"
#import "DJIMarshal+Private.h"
#include <cassert>
namespace
djinni_generated
{
auto
OptColorRecord
::
toCpp
(
ObjcType
obj
)
->
CppType
{
assert
(
obj
);
return
{
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>>::
toCpp
(
obj
.
myColor
)};
}
auto
OptColorRecord
::
fromCpp
(
const
CppType
&
cpp
)
->
ObjcType
{
return
[[
DBOptColorRecord
alloc
]
initWithMyColor
:(
::
djinni
:
:
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
Enum
<::
testsuite
::
color
,
DBColor
>>::
fromCpp
(
cpp
.
my_color
))];
}
}
// namespace djinni_generated
test-suite/generated-src/objc/DBOptColorRecord.mm
deleted
100644 → 0
View file @
f4ce7601
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from enum.djinni
#import "DBOptColorRecord.h"
@implementation
DBOptColorRecord
-
(
nonnull
instancetype
)
initWithMyColor
:(
nullable
NSNumber
*
)
myColor
{
if
(
self
=
[
super
init
])
{
_myColor
=
myColor
;
}
return
self
;
}
+
(
nonnull
instancetype
)
optColorRecordWithMyColor
:(
nullable
NSNumber
*
)
myColor
{
return
[[
self
alloc
]
initWithMyColor
:
myColor
];
}
-
(
NSString
*
)
description
{
return
[
NSString
stringWithFormat
:
@"<%@ %p myColor:%@>"
,
self
.
class
,
(
void
*
)
self
,
self
.
myColor
];
}
@end
test-suite/generated-src/objc/DBTestHelpers+Private.mm
View file @
3a24d6fc
...
...
@@ -5,6 +5,7 @@
#import "DBTestHelpers.h"
#import "DBAssortedPrimitives+Private.h"
#import "DBClientInterface+Private.h"
#import "DBColor+Private.h"
#import "DBMapListRecord+Private.h"
#import "DBNestedCollection+Private.h"
#import "DBPrimitiveList+Private.h"
...
...
test-suite/generated-src/outFileList.txt
View file @
3a24d6fc
...
...
@@ -27,7 +27,8 @@ djinni-output-temp/cpp/Conflict.hpp
djinni-output-temp/cpp/conflict_user.hpp
djinni-output-temp/cpp/user_token.hpp
djinni-output-temp/cpp/color.hpp
djinni-output-temp/cpp/opt_color_record.hpp
djinni-output-temp/cpp/enum_usage_record.hpp
djinni-output-temp/cpp/enum_usage_interface.hpp
djinni-output-temp/cpp/client_returned_record.hpp
djinni-output-temp/cpp/client_interface.hpp
djinni-output-temp/cpp/reverse_client_interface.hpp
...
...
@@ -64,7 +65,8 @@ djinni-output-temp/java/Conflict.java
djinni-output-temp/java/ConflictUser.java
djinni-output-temp/java/UserToken.java
djinni-output-temp/java/Color.java
djinni-output-temp/java/OptColorRecord.java
djinni-output-temp/java/EnumUsageRecord.java
djinni-output-temp/java/EnumUsageInterface.java
djinni-output-temp/java/ClientReturnedRecord.java
djinni-output-temp/java/ClientInterface.java
djinni-output-temp/java/ReverseClientInterface.java
...
...
@@ -121,8 +123,10 @@ djinni-output-temp/jni/NativeConflictUser.cpp
djinni-output-temp/jni/NativeUserToken.hpp
djinni-output-temp/jni/NativeUserToken.cpp
djinni-output-temp/jni/NativeColor.hpp
djinni-output-temp/jni/NativeOptColorRecord.hpp
djinni-output-temp/jni/NativeOptColorRecord.cpp
djinni-output-temp/jni/NativeEnumUsageRecord.hpp
djinni-output-temp/jni/NativeEnumUsageRecord.cpp
djinni-output-temp/jni/NativeEnumUsageInterface.hpp
djinni-output-temp/jni/NativeEnumUsageInterface.cpp
djinni-output-temp/jni/NativeClientReturnedRecord.hpp
djinni-output-temp/jni/NativeClientReturnedRecord.cpp
djinni-output-temp/jni/NativeClientInterface.hpp
...
...
@@ -177,8 +181,9 @@ djinni-output-temp/objc/DBConflict.h
djinni-output-temp/objc/DBConflictUser.h
djinni-output-temp/objc/DBUserToken.h
djinni-output-temp/objc/DBColor.h
djinni-output-temp/objc/DBOptColorRecord.h
djinni-output-temp/objc/DBOptColorRecord.mm
djinni-output-temp/objc/DBEnumUsageRecord.h
djinni-output-temp/objc/DBEnumUsageRecord.mm
djinni-output-temp/objc/DBEnumUsageInterface.h
djinni-output-temp/objc/DBClientReturnedRecord.h
djinni-output-temp/objc/DBClientReturnedRecord.mm
djinni-output-temp/objc/DBClientInterface.h
...
...
@@ -242,8 +247,11 @@ djinni-output-temp/objc/DBConflictUser+Private.h
djinni-output-temp/objc/DBConflictUser+Private.mm
djinni-output-temp/objc/DBUserToken+Private.h
djinni-output-temp/objc/DBUserToken+Private.mm
djinni-output-temp/objc/DBOptColorRecord+Private.h
djinni-output-temp/objc/DBOptColorRecord+Private.mm
djinni-output-temp/objc/DBColor+Private.h
djinni-output-temp/objc/DBEnumUsageRecord+Private.h
djinni-output-temp/objc/DBEnumUsageRecord+Private.mm
djinni-output-temp/objc/DBEnumUsageInterface+Private.h
djinni-output-temp/objc/DBEnumUsageInterface+Private.mm
djinni-output-temp/objc/DBClientReturnedRecord+Private.h
djinni-output-temp/objc/DBClientReturnedRecord+Private.mm
djinni-output-temp/objc/DBClientInterface+Private.h
...
...
test-suite/handwritten-src/cpp/optional.hpp
0 → 100644
View file @
3a24d6fc
This diff is collapsed.
Click to expand it.
test-suite/java/CMakeLists.txt
View file @
3a24d6fc
...
...
@@ -37,7 +37,7 @@ file(
../generated-src/cpp/*.cpp
../handwritten-src/cpp/*.cpp
)
set
(
test_suite_common_flags
"-g -Wall -Werror -std=c++1
y
"
)
set
(
test_suite_common_flags
"-g -Wall -Werror -std=c++1
1
"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
${
test_suite_common_flags
}
"
)
if
(
UNIX OR APPLE
)
...
...
test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj
View file @
3a24d6fc
This diff is collapsed.
Click to expand it.
test-suite/run_djinni.sh
View file @
3a24d6fc
...
...
@@ -75,7 +75,7 @@ fi
--cpp-namespace
testsuite
\
--ident-cpp-enum-type
foo_bar
\
--cpp-optional-template
"std::experimental::optional"
\
--cpp-optional-header
"
<experimental/optional>
"
\
--cpp-optional-header
"
\"
../../handwritten-src/cpp/optional.hpp
\"
"
\
--cpp-extended-record-include-prefix
"../../handwritten-src/cpp/"
\
--cpp-use-wide-strings
true
\
\
...
...
@@ -104,7 +104,7 @@ fi
--cpp-namespace
testsuite
\
--ident-cpp-enum-type
foo_bar
\
--cpp-optional-template
"std::experimental::optional"
\
--cpp-optional-header
"
<experimental/optional>
"
\
--cpp-optional-header
"
\"
../../handwritten-src/cpp/optional.hpp
\"
"
\
--cpp-extended-record-include-prefix
"../../handwritten-src/cpp/"
\
\
--jni-out
"
$temp_out_relative
/jni"
\
...
...
@@ -136,7 +136,7 @@ cp "$base_dir/djinni/yaml-test.djinni" "$temp_out/yaml"
--cpp-out
"
$temp_out_relative
/cpp"
\
--ident-cpp-enum-type
foo_bar
\
--cpp-optional-template
"std::experimental::optional"
\
--cpp-optional-header
"
<experimental/optional>
"
\
--cpp-optional-header
"
\"
../../handwritten-src/cpp/optional.hpp
\"
"
\
\
--jni-out
"
$temp_out_relative
/jni"
\
--ident-jni-class
NativeFooBar
\
...
...
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