Mercurial > hg > truffle

changeset 12373:10b7986aa452

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Christos Kotselidis <christos.kotselidis@oracle.com>
date Fri, 11 Oct 2013 22:40:21 +0200
parents 2dfccd93510a (current diff) cfba4fd3d616 (diff)
children ae1bc462075c
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/gpu/ptx/vm/ptxKernelArguments.cpp	Fri Oct 11 21:41:42 2013 +0200
+++ b/src/gpu/ptx/vm/ptxKernelArguments.cpp	Fri Oct 11 22:40:21 2013 +0200
@@ -98,7 +98,7 @@
             _success = false;
             return;
         }
-        *((gpu::Ptx::CUdeviceptr*) &_kernelArgBuffer[_bufferOffset]) = floatval.f;
+        *((gpu::Ptx::CUdeviceptr*) &_kernelArgBuffer[_bufferOffset]) = (gpu::Ptx::CUdeviceptr) floatval.f;
         _bufferOffset += sizeof(floatval.f);
     }
     return;
@@ -131,7 +131,7 @@
             _success = false;
             return;
         }
-        *((gpu::Ptx::CUdeviceptr*) &_kernelArgBuffer[_bufferOffset]) = doubleval.d;
+        *((gpu::Ptx::CUdeviceptr*) &_kernelArgBuffer[_bufferOffset]) = (gpu::Ptx::CUdeviceptr) doubleval.d;
         _bufferOffset += sizeof(doubleval.d);
     }
     return;