Changeset 19334 for trunk/Mars

Timestamp:

10/30/18 15:53:57 (6 years ago)

Author:

tbretz

Message:

Make sure that if root decides to delete TFormula we are not deleting it again.

Location:

trunk/Mars/mdata

Files:

• MDataPhrase.cc (modified) (5 diffs)
• MDataPhrase.h (modified) (1 diff)

trunk/Mars/mdata/MDataPhrase.cc

@@ -425 +425 @@
 }
 
+void MDataPhrase::RecursiveRemove(TObject *obj)
+{
+    if (fFormula==obj)
+        fFormula = NULL;
+}
+
+
 // --------------------------------------------------------------------------
 //
@@ -441 +448 @@
 
     fFormula = new TFormula;
+    fFormula->SetBit(kMustCleanup);
 
     // Must have a name otherwise all axis labels disappear like a miracle
@@ -517 +525 @@
     if (rule)
         SetRule(rule);
+
+    // Make sure that all object deleted are also deleted from this list
+    gROOT->GetListOfCleanups()->Add(this);
+    // Make sure that this doesn't remain in ListOfCleanups after deletion
+    SetBit(kMustCleanup);
 }
 
@@ -541 +554 @@
 
     fFormula = f ? (TFormula*)f->Clone() : 0;
+    fFormula->SetBit(kMustCleanup);
     gROOT->GetListOfFunctions()->Remove(fFormula);
 
@@ -549 +563 @@
     while ((o=Next()))
         fMembers.AddLast(o->Clone());
+
+    // Make sure that all object deleted are also deleted from this list
+    gROOT->GetListOfCleanups()->Add(this);
+    // Make sure that this doesn't remain in ListOfCleanups after deletion
+    SetBit(kMustCleanup);
 }
 

trunk/Mars/mdata/MDataPhrase.h

@@ -36 +36 @@
     // TObject
     void     Clear(Option_t *o="");
+    void     RecursiveRemove(TObject *obj);
 
     // MParContainer