[cig-commits] [commit] devel, master: fix compilation bugs (cudacc stricter than gccwq) (71b75c4)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Thu Nov 6 08:33:03 PST 2014


Repository : https://github.com/geodynamics/specfem3d_globe

On branches: devel,master
Link       : https://github.com/geodynamics/specfem3d_globe/compare/bc58e579b3b0838a0968725a076f5904845437ca...be63f20cbb6f462104e949894dbe205d2398cd7f

>---------------------------------------------------------------

commit 71b75c440cfe0058332311ccd87b5cd69aeb1436
Author: Kevin Pouget <kevin.pouget at imag.fr>
Date:   Thu Oct 23 16:18:47 2014 +0200

    fix compilation bugs (cudacc stricter than gccwq)


>---------------------------------------------------------------

71b75c440cfe0058332311ccd87b5cd69aeb1436
 src/gpu/initialize_gpu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gpu/initialize_gpu.c b/src/gpu/initialize_gpu.c
index 95ee58a..c5b4206 100644
--- a/src/gpu/initialize_gpu.c
+++ b/src/gpu/initialize_gpu.c
@@ -520,7 +520,7 @@ void ocl_select_device(const char *platform_filter, const char *device_filter, i
         clCheck( clGetPlatformInfo(platform_ids[i], props_to_check[j], info_length, info, NULL));
 
         // stores info
-        info_all[i][j] = malloc( strlen(info) + 1);
+        info_all[i][j] = (char *) malloc( strlen(info) + 1);
         strcpy(info_all[i][j],info);
 
         // sets matching platform id
@@ -606,7 +606,7 @@ void ocl_select_device(const char *platform_filter, const char *device_filter, i
       clCheck( clGetDeviceInfo(device_ids[i], CL_DEVICE_NAME, info_length, info, NULL));
 
       // stores info
-      info_device_all[i] = malloc( strlen(info) + 1);
+      info_device_all[i] = (char *) malloc( strlen(info) + 1);
       strcpy(info_device_all[i],info);
 
       // sets matching device id



More information about the CIG-COMMITS mailing list