JavaCL: fix compilation with currently published BridJ version

ochafik · ochafik · commit 8e548f8e27ae · 2013-09-14T18:41:55.000+01:00
diff --git a/Core/src/main/velocity/com/nativelibs4java/opencl/CLBuffer.java b/Core/src/main/velocity/com/nativelibs4java/opencl/CLBuffer.java
@@ -19,6 +19,7 @@
 import com.nativelibs4java.util.NIOUtils;
 import org.bridj.util.Utils;
 import static org.bridj.Pointer.*;
+import static com.nativelibs4java.opencl.proxy.PointerUtils.*;
 
 
 /**
diff --git a/Core/src/main/velocity/com/nativelibs4java/opencl/CLContext.java b/Core/src/main/velocity/com/nativelibs4java/opencl/CLContext.java
@@ -43,6 +43,7 @@
 import com.nativelibs4java.util.NIOUtils;
 import org.bridj.*;
 import static org.bridj.Pointer.*;
+import static com.nativelibs4java.opencl.proxy.PointerUtils.*;
 import java.io.InputStream;
 import java.util.Arrays;
 import java.util.Map;
diff --git a/Core/src/main/velocity/com/nativelibs4java/opencl/CLEvent.java b/Core/src/main/velocity/com/nativelibs4java/opencl/CLEvent.java
@@ -14,6 +14,7 @@
 import org.bridj.*;
 import org.bridj.ann.Ptr;
 import static org.bridj.Pointer.*;
+import static com.nativelibs4java.opencl.proxy.PointerUtils.*;
 
 /**
  * OpenCL event object.<br/>
diff --git a/Core/src/main/velocity/com/nativelibs4java/opencl/CLMem.java b/Core/src/main/velocity/com/nativelibs4java/opencl/CLMem.java
@@ -14,7 +14,7 @@
 import org.bridj.ann.Ptr;
 import org.bridj.*;
 import static org.bridj.Pointer.*;
-
+import static com.nativelibs4java.opencl.proxy.PointerUtils.*;
 
 /**
  * OpenCL memory object.<br/>
diff --git a/OpenCL4Java/src/main/java/com/nativelibs4java/opencl/proxy/PointerUtils.java b/OpenCL4Java/src/main/java/com/nativelibs4java/opencl/proxy/PointerUtils.java
@@ -23,7 +23,8 @@ protected static void setPointerAtIndex(long peer, int index, Pointer<?> value)
     }
     
     protected static void setPointerAtIndex(long peer, int index, NativeObject value) {
-        pointerToAddress(peer).setSizeTAtIndex(index, Pointer.getPeer(Pointer.getPointer(value)));
+        //pointerToAddress(peer).setSizeTAtIndex(index, Pointer.getPeer(Pointer.getPointer(value)));
+        pointerToAddress(peer).setSizeTAtIndex(index, Pointer.getPeer(Pointer.pointerTo(value)));
     }
     
     protected static long getSizeT(long peer) {
@@ -34,6 +35,10 @@ protected static <T> Pointer<T> getPointer(long peer, Class<T> targetClass) {
         return pointerToAddress(peer).getPointer(targetClass);
     }
     
+    public static <N extends NativeObject> Pointer<N> getPointer(N instance) {
+        return pointerTo(instance);
+    }
+    
     protected static void setInt(long peer, int value) {
         pointerToAddress(peer).setInt(value);
     }

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@ protected static void setPointerAtIndex(long peer, int index, Pointer<?> value)`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`protected static void setPointerAtIndex(long peer, int index, NativeObject value) {`
`26`		`- pointerToAddress(peer).setSizeTAtIndex(index, Pointer.getPeer(Pointer.getPointer(value)));`
	`26`	`+ //pointerToAddress(peer).setSizeTAtIndex(index, Pointer.getPeer(Pointer.getPointer(value)));`
	`27`	`+ pointerToAddress(peer).setSizeTAtIndex(index, Pointer.getPeer(Pointer.pointerTo(value)));`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`protected static long getSizeT(long peer) {`
`@@ -34,6 +35,10 @@ protected static <T> Pointer<T> getPointer(long peer, Class<T> targetClass) {`
`34`	`35`	`return pointerToAddress(peer).getPointer(targetClass);`
`35`	`36`	`}`
`36`	`37`
	`38`	`+ public static <N extends NativeObject> Pointer<N> getPointer(N instance) {`
	`39`	`+ return pointerTo(instance);`
	`40`	`+ }`
	`41`	`+`
`37`	`42`	`protected static void setInt(long peer, int value) {`
`38`	`43`	`pointerToAddress(peer).setInt(value);`
`39`	`44`	`}`