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
079d9723
Commit
079d9723
authored
Jun 10, 2016
by
Andrew Twyman
Committed by
GitHub
Jun 10, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #235 from jefftrull/narrowing_conversions
clean up narrowing conversion warnings in x86_64
parents
1dc5a248
4a40128e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
support-lib/jni/Marshal.hpp
support-lib/jni/Marshal.hpp
+1
-1
support-lib/jni/djinni_support.cpp
support-lib/jni/djinni_support.cpp
+1
-1
No files found.
support-lib/jni/Marshal.hpp
View file @
079d9723
...
@@ -230,7 +230,7 @@ namespace djinni
...
@@ -230,7 +230,7 @@ namespace djinni
// Using .data() on an empty vector is UB
// Using .data() on an empty vector is UB
if
(
!
c
.
empty
())
if
(
!
c
.
empty
())
{
{
jniEnv
->
SetByteArrayRegion
(
j
.
get
(),
0
,
c
.
size
(
),
reinterpret_cast
<
const
jbyte
*>
(
c
.
data
()));
jniEnv
->
SetByteArrayRegion
(
j
.
get
(),
0
,
jsize
(
c
.
size
()
),
reinterpret_cast
<
const
jbyte
*>
(
c
.
data
()));
}
}
return
j
;
return
j
;
}
}
...
...
support-lib/jni/djinni_support.cpp
View file @
079d9723
...
@@ -366,7 +366,7 @@ jstring jniStringFromUTF8(JNIEnv * env, const std::string & str) {
...
@@ -366,7 +366,7 @@ jstring jniStringFromUTF8(JNIEnv * env, const std::string & str) {
utf16_encode
(
utf8_decode
(
str
,
i
),
utf16
);
utf16_encode
(
utf8_decode
(
str
,
i
),
utf16
);
jstring
res
=
env
->
NewString
(
jstring
res
=
env
->
NewString
(
reinterpret_cast
<
const
jchar
*>
(
utf16
.
data
()),
utf16
.
length
(
));
reinterpret_cast
<
const
jchar
*>
(
utf16
.
data
()),
jsize
(
utf16
.
length
()
));
DJINNI_ASSERT
(
res
,
env
);
DJINNI_ASSERT
(
res
,
env
);
return
res
;
return
res
;
}
}
...
...
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