diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2016-07-22 20:05:52 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2016-07-22 20:05:52 +0000 |
| commit | 8bab7985c811e49bb1f90d442fc53e95f2b4dcdc (patch) | |
| tree | abdbd898676e1f853fca2d7e031d105d7ebcf676 /libjava/java | |
| parent | c2e6d4d297c6964f960822f58e56a6d80ca71307 (diff) | |
| parent | 22b955cca564a9a3a5b8c9d9dd1e295b7943c128 (diff) | |
| download | gcc-8bab7985c811e49bb1f90d442fc53e95f2b4dcdc.zip gcc-8bab7985c811e49bb1f90d442fc53e95f2b4dcdc.tar.gz gcc-8bab7985c811e49bb1f90d442fc53e95f2b4dcdc.tar.bz2 | |
Merge from trunk revision 238662.
From-SVN: r238667
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/lang/reflect/natVMProxy.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libjava/java/lang/reflect/natVMProxy.cc b/libjava/java/lang/reflect/natVMProxy.cc index e46263d..19cde20 100644 --- a/libjava/java/lang/reflect/natVMProxy.cc +++ b/libjava/java/lang/reflect/natVMProxy.cc @@ -272,17 +272,17 @@ unbox (jobject o, jclass klass, void *rvalue, FFI_TYPE type) if (klass == JvPrimClass (byte)) { _Jv_CheckCast (&Byte::class$, o); - *(jbyte*)rvalue = ((Byte*)o)->byteValue(); + *(ffi_arg*)rvalue = ((Byte*)o)->byteValue(); } else if (klass == JvPrimClass (short)) { _Jv_CheckCast (&Short::class$, o); - *(jshort*)rvalue = ((Short*)o)->shortValue(); + *(ffi_arg*)rvalue = ((Short*)o)->shortValue(); } else if (klass == JvPrimClass (int)) { _Jv_CheckCast (&Integer::class$, o); - *(jint*)rvalue = ((Integer*)o)->intValue(); + *(ffi_arg*)rvalue = ((Integer*)o)->intValue(); } else if (klass == JvPrimClass (long)) { @@ -302,12 +302,12 @@ unbox (jobject o, jclass klass, void *rvalue, FFI_TYPE type) else if (klass == JvPrimClass (boolean)) { _Jv_CheckCast (&Boolean::class$, o); - *(jboolean*)rvalue = ((Boolean*)o)->booleanValue(); + *(ffi_arg*)rvalue = ((Boolean*)o)->booleanValue(); } else if (klass == JvPrimClass (char)) { _Jv_CheckCast (&Character::class$, o); - *(jchar*)rvalue = ((Character*)o)->charValue(); + *(ffi_arg*)rvalue = ((Character*)o)->charValue(); } else JvFail ("Bad ffi type in proxy"); |