Changeset b1c3295 in sasview for sansmodels/src/sans/models/c_models/CPearlNecklaceModel.cpp

Timestamp:

Dec 7, 2011 3:02:10 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:

00c2141

Parents:

8bac371

Message:

Re #4 This should clean up a whole bunch of C++ warnings.

File:

• sansmodels/src/sans/models/c_models/CPearlNecklaceModel.cpp (modified) (1 diff)

sansmodels/src/sans/models/c_models/CPearlNecklaceModel.cpp

@@ -120 +120 @@
 }
 
+static char name_params[] = "params";
+static char def_params[] = "Parameters";
+static char name_dispersion[] = "dispersion";
+static char def_dispersion[] = "Dispersion parameters";
+static char name_log[] = "log";
+static char def_log[] = "Log";
+
 static PyMemberDef CPearlNecklaceModel_members[] = {
-    {"params", T_OBJECT, offsetof(CPearlNecklaceModel, params), 0,
-     "Parameters"},
-        {"dispersion", T_OBJECT, offsetof(CPearlNecklaceModel, dispersion), 0,
-          "Dispersion parameters"},     
-    {"log", T_OBJECT, offsetof(CPearlNecklaceModel, log), 0,
-     "Log"},
+    {name_params, T_OBJECT, offsetof(CPearlNecklaceModel, params), 0, def_params},
+        {name_dispersion, T_OBJECT, offsetof(CPearlNecklaceModel, dispersion), 0, def_dispersion},     
+    {name_log, T_OBJECT, offsetof(CPearlNecklaceModel, log), 0, def_log},
     {NULL}  /* Sentinel */
 };