Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Q

QueryR
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

cf300b93

Commit cf300b93 authored 8 years ago by Lukas Stadler

Downloads
- Plain Diff

Merge pull request #592 in G/fastr from ~MICK.JORDAN_ORACLE.COM/fastr:feature/ffi to master

* commit '3f831635':
  rffi: fix thread safety related to recent change to use Nodes

parents 777550d5 3f831635

Branches

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/jni/JNI_C.java 7 additions, 5 deletions

...e.ffi/src/com/oracle/truffle/r/runtime/ffi/jni/JNI_C.java
com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/jni/JNI_Call.java 58 additions, 48 deletions

...fi/src/com/oracle/truffle/r/runtime/ffi/jni/JNI_Call.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/DLL.java 2 additions, 2 deletions

...e.r.runtime/src/com/oracle/truffle/r/runtime/ffi/DLL.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/DLLRFFI.java 7 additions, 1 deletion

...runtime/src/com/oracle/truffle/r/runtime/ffi/DLLRFFI.java

with 74 additions and 56 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment