3 files changed, 8 insertions, 6 deletions
diff --git a/src/com/mbien/opencl/CLCommandQueue.java b/src/com/mbien/opencl/CLCommandQueue.java
index bc50210e..9825b871 100644
--- a/src/com/mbien/opencl/CLCommandQueue.java
+++ b/src/com/mbien/opencl/CLCommandQueue.java
@@ -179,18 +179,20 @@ public class CLCommandQueue implements CLResource {
         return this;
     }
 
-    public CLCommandQueue putWaitForEvent(CLEventList list, int index) {
+    public CLCommandQueue putWaitForEvent(CLEventList list, int index, boolean blockingWait) {
         int marker = list.IDs.position()-1;
         list.IDs.position(index);
-        int ret = cl.clWaitForEvents(1, list.IDs);
+        int ret = blockingWait ? cl.clWaitForEvents(1, list.IDs)
+                               : cl.clEnqueueWaitForEvents(ID, 1, list.IDs);
         list.IDs.position(marker);
         checkForError(ret, "error while waiting for events");
         return this;
     }
 
-    public CLCommandQueue putWaitForEvents(CLEventList list) {
+    public CLCommandQueue putWaitForEvents(CLEventList list, boolean blockingWait) {
         list.IDs.rewind();
-        int ret = cl.clWaitForEvents(list.size, list.IDs);
+        int ret = blockingWait ? cl.clWaitForEvents(list.size, list.IDs)
+                               : cl.clEnqueueWaitForEvents(ID, list.size, list.IDs);
         checkForError(ret, "error while waiting for events");
         return this;
     }
diff --git a/src/com/mbien/opencl/CLDevice.java b/src/com/mbien/opencl/CLDevice.java
index 44fbabfb..c948024b 100644
--- a/src/com/mbien/opencl/CLDevice.java
+++ b/src/com/mbien/opencl/CLDevice.java
@@ -331,7 +331,7 @@ public final class CLDevice {
     /**
      * Returns the optional double precision floating-point capability of the device.
      * The mandated minimum double precision floating-point capabilities are {@link FPConfig#FMA},
-     * {@link FPConfig#ROUND_TO_NEAREST}, {@link FPConfig#_ROUND_TO_ZERO},
+     * {@link FPConfig#ROUND_TO_NEAREST}, {@link FPConfig#ROUND_TO_ZERO},
      * {@link FPConfig#ROUND_TO_INF}, {@link FPConfig#INF_NAN}, and {@link FPConfig#DENORM}.
      * @return An EnumSet containing the extensions, never null.
      */
diff --git a/src/com/mbien/opencl/QueueBarrier.java b/src/com/mbien/opencl/QueueBarrier.java
index 73339192..37c5d3f1 100644
--- a/src/com/mbien/opencl/QueueBarrier.java
+++ b/src/com/mbien/opencl/QueueBarrier.java
@@ -51,7 +51,7 @@ public class QueueBarrier {
     public QueueBarrier waitFor(CLCommandQueue queue, CLEventList events) {
         checkQueue(queue);
 
-        queue.putWaitForEvents(events);
+        queue.putWaitForEvents(events, true);
         latch.countDown();
         return this;
     }