Changeset 14888 for trunk/Mars/mbase

Timestamp:

02/13/13 09:53:24 (12 years ago)

Author:

tbretz

Message:

Added a possible fix for newer root versions... might not be the best one yet.

File:

• trunk/Mars/mbase/MStatusArray.cc (modified) (6 diffs)

trunk/Mars/mbase/MStatusArray.cc

@@ -108 +108 @@
 #ifdef DEBUG
             cout << "Start Delete " << o << " " << o->GetName() << " " << o->ClassName() << endl;
-            ptr = o;
 #endif
             delete o;
 
 #ifdef DEBUG
-            ptr = 0;
             cout << "Done  Delete " << o<< endl;
 #endif
@@ -218 +216 @@
         {
 #ifdef DEBUG
-            cout << "MStatusArray::RecursiveRemove " << obj << " from TGraph " << g << endl;
+            gLog << all << "MStatusArray::RecursiveRemove " << obj << " from TGraph " << g << endl;
 #endif
 
@@ -227 +225 @@
             {
 #ifdef DEBUG
-                cout << "       SetHist(0)" << endl;
+                gLog << all << "       SetHist(0)" << endl;
 #endif
                 g->SetHistogram(0);
-                continue;
             }
 
@@ -240 +237 @@
             {
 #ifdef DEBUG
-                cout << "       SetFunc(0)" << endl;
+                gLog << all << "       SetFunc(0)" << endl;
 #endif
                 static_cast<MyGraph*>(g)->ResetListOfFunctions();
-                continue;
             }
         }
@@ -306 +302 @@
         SetCleanup(o);
 
+#if ROOT_VERSION_CODE < ROOT_VERSION(5,26,00)
     // Now delete the MARS object first because we have full control
     // of them
@@ -316 +313 @@
     while ((o=Next3()))
         while (!RecursiveDelete(dynamic_cast<TVirtualPad*>(o)));
+#endif
 
     // And delete all the rest