From e87efa89eb8f0f54577d43714eb247d3cac35108 Mon Sep 17 00:00:00 2001 From: ana Date: Mon, 22 Oct 2012 06:36:04 +0000 Subject: [PATCH] CMake compatibility: fix error: expected 'float *' but argument is of type 'double *' --- src/DSC/DSC_User/Datastream/Calcium/calciumf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DSC/DSC_User/Datastream/Calcium/calciumf.c b/src/DSC/DSC_User/Datastream/Calcium/calciumf.c index de55a4e86..e01915c73 100644 --- a/src/DSC/DSC_User/Datastream/Calcium/calciumf.c +++ b/src/DSC/DSC_User/Datastream/Calcium/calciumf.c @@ -247,7 +247,7 @@ void F_FUNC(cplrd,CPLRD)(long *compo,cal_int *dep,float *ti,float *tf,cal_int *i cal_int *max,cal_int *n, double *tab,cal_int *err STR_PLEN(nom)) { char* cnom=fstr1(STR_PTR(nom),STR_LEN(nom)); - *err=cp_lrd_fort_((void *)*compo,*dep,ti,tf,iter,cnom,*max,n,tab); + *err=cp_lrd_fort_((void *)*compo,*dep,ti,tf,iter,cnom,*max,n,(float *)tab); free_str1(cnom); } @@ -363,7 +363,7 @@ void F_FUNC(cperd,CPERD)(long *compo,cal_int *dep,float *ti,cal_int *iter,STR_PS float tti=0.; if(*dep == CP_TEMPS)tti=*ti; char* cnom=fstr1(STR_PTR(nom),STR_LEN(nom)); - *err=cp_erd_fort_((void *)*compo,*dep,tti,*iter,cnom,*n,tab); + *err=cp_erd_fort_((void *)*compo,*dep,tti,*iter,cnom,*n,(float *)tab); free_str1(cnom); } -- 2.39.2