Changeset 7179 for trunk/MagicSoft/Mars/mbase

Timestamp:

07/11/05 10:34:49 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MParContainer.cc (modified) (1 diff)
• MString.h (modified) (1 diff)
• MTask.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -229 +229 @@
     // point to a random memory segment, because the TString has gone.
     //
-    MString desc;
-    desc.Print("%s [%s]", o.GetName(), o.ClassName());
-    return (TString)o.GetName()==o.ClassName() ? o.ClassName() : desc;
+    return (TString)o.GetName()==o.ClassName() ? (TString)o.ClassName() :
+        MString::Form("%s [%s]", o.GetName(), o.ClassName());
 }
 

trunk/MagicSoft/Mars/mbase/MString.h

@@ -12 +12 @@
 {
 public:
+    MString(const char *txt=0)  : TString(txt) { }
+    MString(const TString &txt) : TString(txt) { }
+
     MString &Print(const char *fmt, va_list &ap);
     MString &Print(const char *fmt, ...);

trunk/MagicSoft/Mars/mbase/MTask.cc

@@ -356 +356 @@
     //
     if (fName==ClassName())
-        return fSerialNumber==0 ? ClassName() : MString::Form("%s;%d", ClassName(), fSerialNumber);
+        return fSerialNumber==0 ? (TString)ClassName() : MString::Form("%s;%d", ClassName(), fSerialNumber);
 
     return fSerialNumber>0 ?
         MString::Form("%s;%d [%s]", fName.Data(), fSerialNumber, ClassName()) :
-        MString::Form("%s [%s]", fName.Data(), ClassName());
+        MString::Form("%s [%s]",    fName.Data(), ClassName());
 }