Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • sansmodels/src/sans/models/c_models/CLamellarModel.cpp

    r35aface rb1c3295  
    113113} 
    114114 
     115static char name_params[] = "params"; 
     116static char def_params[] = "Parameters"; 
     117static char name_dispersion[] = "dispersion"; 
     118static char def_dispersion[] = "Dispersion parameters"; 
     119static char name_log[] = "log"; 
     120static char def_log[] = "Log"; 
     121 
    115122static PyMemberDef CLamellarModel_members[] = { 
    116     {"params", T_OBJECT, offsetof(CLamellarModel, params), 0, 
    117      "Parameters"}, 
    118         {"dispersion", T_OBJECT, offsetof(CLamellarModel, dispersion), 0, 
    119           "Dispersion parameters"},      
    120     {"log", T_OBJECT, offsetof(CLamellarModel, log), 0, 
    121      "Log"}, 
     123    {name_params, T_OBJECT, offsetof(CLamellarModel, params), 0, def_params}, 
     124        {name_dispersion, T_OBJECT, offsetof(CLamellarModel, dispersion), 0, def_dispersion},      
     125    {name_log, T_OBJECT, offsetof(CLamellarModel, log), 0, def_log}, 
    122126    {NULL}  /* Sentinel */ 
    123127}; 
Note: See TracChangeset for help on using the changeset viewer.