Changeset 19345


Ignore:
Timestamp:
11/01/18 20:43:06 (6 years ago)
Author:
tbretz
Message:
Improves the behaviour with RecursiveRemove. Strictly speaking this change might only be necessary if a class contains more than one member which is bound to recursive remove. Onth other hand setting all members to NULL which might be affected by RecursiveRemove is not wrong either.
Location:
trunk/Mars
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Mars/mbase/MEvtLoop.cc

    r13364 r19345  
    119119{
    120120    if (TestBit(kIsOwner) && fParList)
     121    {
    121122        delete fParList;
     123        fParList = 0;
     124    }
    122125}
    123126

  • trunk/Mars/mbase/MParList.cc

    r18999 r19345  
    140140    //   garbage collection?
    141141    delete fContainer;
     142    fContainer = 0;
     143
    142144    delete fAutodelete;
     145    fAutodelete = 0;
     146
    143147}
    144148

  • trunk/Mars/mbase/MTask.cc

    r9578 r19345  
    137137{
    138138    delete fStopwatch;
     139    fStopwatch = 0;
     140
    139141    delete fListOfBranches;
     142    fListOfBranches = 0;
    140143}
    141144

  • trunk/Mars/mbase/MTaskList.cc

    r9343 r19345  
    127127
    128128    delete fTasks;
     129    fTasks = 0;
    129130}
    130131

  • trunk/Mars/mdata/MDataPhrase.cc

    r19335 r19345  
    540540{
    541541    if (fFormula)
     542    {
    542543        delete fFormula;
     544        fFormula = 0;
     545    }
    543546}
    544547

  • trunk/Mars/mhbase/MH3.cc

    r19254 r19345  
    428428{
    429429    if (fHist)
     430    {
    430431        delete fHist;
     432        fHist = 0;
     433    }
    431434
    432435    if (fConversion)
     436    {
    433437        delete fConversion;
     438        fConversion = 0;
     439    }
    434440
    435441    if (fWeight)
     442    {
    436443        delete fWeight;
     444        fWeight = 0;
     445    }
    437446
    438447    for (int i=0; i<4; i++)
    439448        if (fData[i])
     449        {
    440450            delete fData[i];
     451            fData[i] = 0;
     452        }
    441453
    442454    for (int i=0; i<3; i++)

  • trunk/Mars/mhbase/MHn.cc

    r19304 r19345  
    154154    for (int i=0; i<fNum; i++)
    155155        if (fHist[i])
     156        {
    156157            delete fHist[i];
     158            fHist[i] = 0;
     159        }
    157160}
    158161

  • trunk/Mars/mhist/MHCamEvent.cc

    r13398 r19345  
    127127{
    128128    if (fSum)
     129    {
    129130        delete fSum;
     131        fSum = 0;
     132    }
    130133}
    131134

  • trunk/Mars/mhist/MHCamera.cc

    r19304 r19345  
    203203{
    204204    if (fGeomCam)
    205       delete fGeomCam;
     205    {
     206        delete fGeomCam;
     207        fGeomCam = 0;
     208    }
    206209    if (fNotify)
    207       delete fNotify;
     210    {
     211        delete fNotify;
     212        fNotify = 0;
     213    }
    208214}
    209215

  • trunk/Mars/mhvstime/MHSectorVsTime.cc

    r12880 r19345  
    122122{
    123123    if (fGraph)
     124    {
    124125        delete fGraph;
     126        fGraph = 0;
     127    }
    125128}
    126129

  • trunk/Mars/mtools/MagicJam.cc

    r9385 r19345  
    194194{
    195195    if (fImage)
     196    {
    196197        delete fImage;
     198        fImage = 0;
     199    }
    197200}
    198201
Note: See TracChangeset for help on using the changeset viewer.