# HG changeset patch
# User Christos Kotselidis <christos.kotselidis@oracle.com>
# Date 1381524021 -7200
# Node ID 10b7986aa452ea791dca9a8480d5ceb650bc33fd
# Parent  2dfccd93510a61ef065b056be661c0303f53e325# Parent  cfba4fd3d616d458c80b04a79f4e3eceb5e2f66f
Merge

diff -r 2dfccd93510a -r 10b7986aa452 src/gpu/ptx/vm/ptxKernelArguments.cpp
--- 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;