Changeset f54e82cf in sasview for src/sas/sascalc/calculator/c_extensions/librefl.h

Timestamp:

Jul 31, 2018 4:36:52 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

d9b7197

Parents:

3067196

git-author:

Torin Cooper-Bennun <torin.cooper-bennun@…> (07/30/18 10:35:02)

git-committer:

Torin Cooper-Bennun <torin.cooper-bennun@…> (07/31/18 04:36:52)

Message:

Cherry-pick changes from master for tinycc compatibility (note: tinycc compilation not yet supported fully):

144e032af2 tinycc doesn't return structures, so must pass return structure as pointer
a1daf86c0d hack around broken isfinite/isnan in tinycc
7e82256ecb declare all variables at the start of the block so C89 compilers don't complain

File:

• src/sas/sascalc/calculator/c_extensions/librefl.h (modified) (1 diff)

src/sas/sascalc/calculator/c_extensions/librefl.h

@@ -5 +5 @@
         double re;
         double im;
-} complex;
+} Cplx;
 
 typedef struct {
-        complex a;
-        complex b;
-        complex c;
-        complex d;
+        Cplx a;
+        Cplx b;
+        Cplx c;
+        Cplx d;
 } matrix;
 
-complex cassign(double real, double imag);
+void cassign(Cplx*, double real, double imag);
 
-complex cplx_add(complex x,complex y);
+void cplx_add(Cplx*, Cplx x,Cplx y);
 
-complex rcmult(double x,complex y);
+void rcmult(Cplx*, double x,Cplx y);
 
-complex cplx_sub(complex x,complex y);
+void cplx_sub(Cplx*, Cplx x,Cplx y);
 
-complex cplx_mult(complex x,complex y);
+void cplx_mult(Cplx*, Cplx x,Cplx y);
 
-complex cplx_div(complex x,complex y);
+void cplx_div(Cplx*, Cplx x,Cplx y);
 
-complex cplx_exp(complex b);
+void cplx_exp(Cplx*, Cplx b);
 
-complex cplx_sqrt(complex z);
+void cplx_sqrt(Cplx*, Cplx z);
 
-complex cplx_cos(complex b);
+void cplx_cos(Cplx*, Cplx b);
 
 double intersldfunc(int fun_type, double n_sub, double i, double nu, double sld_l, double sld_r);