Changeset 890ac7f1 in sasview for sansmodels/src/sans/models/c_extensions/sld_cal.c

Timestamp:

Nov 30, 2011 12:43:17 PM (13 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

2138c061

Parents:

e161fac

Message:

Re #5 fixing samsmodels compilation on MSVC

File:

• sansmodels/src/sans/models/c_extensions/sld_cal.c (modified) (2 diffs)

sansmodels/src/sans/models/c_extensions/sld_cal.c

@@ -17 +17 @@
 double sld_cal_analytical_1D(SLDCalParameters *pars, double x) {
         double fun, nsl, n_s, fun_coef, sld_l, sld_r, sld_out;
+        int fun_type;
 
         fun = pars->fun_type;
@@ -25 +26 @@
         sld_r = pars-> sld_right;
 
-        int fun_type = floor(fun);
+        fun_type = floor(fun);
 
         sld_out = intersldfunc(fun_type, nsl, n_s, fun_coef, sld_l, sld_r);