Merge pull request #50 from ThoughtWorksInc/simplify

Simplify toHostBuffer implementation
ThoughtWorksInc · Feb 11, 2018 · 6baefba · 6baefba
2 parents 35f8287 + 99d0cec
commit 6baefba
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/OpenCL/src/main/scala/com/thoughtworks/compute/OpenCL.scala b/OpenCL/src/main/scala/com/thoughtworks/compute/OpenCL.scala
@@ -615,11 +615,10 @@ object OpenCL {
         Resource(value = Success(hostBuffer), release = UnitContinuation.delay { memory.free(hostBuffer) })
       }))).flatMap { hostBuffer =>
         enqueueReadBuffer[memory.HostBuffer](hostBuffer, preconditionEvents: _*)(witnessOwner, memory)
-          .flatMap { event =>
-            Do.garbageCollected(event.waitForComplete())
-          }
-          .intransitiveMap { _: Unit =>
-            hostBuffer
+          .intransitiveFlatMap { event =>
+            Do.garbageCollected(event.waitForComplete()).map { _: Unit =>
+              hostBuffer
+            }
           }
       }
     }