Changeset 851 for trunk/MagicSoft/Mars/mbase

Timestamp:

06/13/01 15:29:47 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MAGIC.h (modified) (1 diff)
• MParContainer.cc (modified) (1 diff)
• MTaskList.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MAGIC.h

@@ -9 +9 @@
 ///////////////////////////////////////////////////////////////////////////////
 
+#ifndef ROOT_TROOT
 #include <TROOT.h>
+#endif
 
 //

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -65 +65 @@
 MParContainer& MParContainer::operator=(const MParContainer& rhs)
 {
-    if (this != &rhs) {
-        TObject::operator=(rhs);
-        *fName  = *(rhs.fName);
-        *fTitle = *(rhs.fTitle);
-        fLog    = rhs.fLog;
-        fHasChanged = rhs.fHasChanged;
-    }
+    if (this == &rhs)
+        return *this;
+
+    TObject::operator=(rhs);
+
+    *fName  = *(rhs.fName);
+    *fTitle = *(rhs.fTitle);
+
+    fLog        = rhs.fLog;
+    fHasChanged = rhs.fHasChanged;
+
     return *this;
 }

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -227 +227 @@
     *fLog << "Postprocessing... " << flush;
 
-    // FIXME: At the moment all containers are post processed independ of
+    // FIXME: At the moment all tasks are post processed independ of
     // whether it was preprocessed or not.
+
+    //
+    // Reset the HasChanged flag.
+    // Reset all containers.
+    //
+    fParList->SetHasChanged(kFALSE);
+    fParList->Reset();
 
     //