Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 9489)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 9490)
@@ -18,4 +18,21 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2009/08/13 Thomas Bretz
+
+   * mbase/Margs.cc:
+     - fixed a problem returning 0 instead of "" for TString
+
+   * mbase/MLut.h, mbase/MStatusArray.h:
+     - added new overloads for Print to make it compile with newer root
+       versions without warning
+
+   * msimreflector/MReflector.cc:
+     - replaced ForEach to make it compile with newer root versions
+
+   * mtrigger/MTriggerPatternDecode.cc:
+     - removed some accidental debug output
+
+
 
  2009/08/13 Daniela Dorner
Index: /trunk/MagicSoft/Mars/mbase/MArgs.cc
===================================================================
--- /trunk/MagicSoft/Mars/mbase/MArgs.cc	(revision 9489)
+++ /trunk/MagicSoft/Mars/mbase/MArgs.cc	(revision 9490)
@@ -182,5 +182,5 @@
         if (s->BeginsWith(name))
             return s->Data()+s->Index(name)+name.Length();
-    return 0;
+    return "";
 }
 
@@ -230,5 +230,5 @@
             return str;
         }
-    return 0;
+    return "";
 }
 
Index: /trunk/MagicSoft/Mars/mbase/MLut.h
===================================================================
--- /trunk/MagicSoft/Mars/mbase/MLut.h	(revision 9489)
+++ /trunk/MagicSoft/Mars/mbase/MLut.h	(revision 9490)
@@ -56,5 +56,8 @@
     // TObject
     void Print(const Option_t *o="") const;
-    void Print(const Option_t *o, const Option_t *o2) const { Print(o); }
+    void Print(const Option_t *o, Option_t *) const         { Print(o); }
+    void Print(const Option_t *o, Int_t) const              { Print(o); }
+    void Print(const Option_t *o, const char*, Int_t) const { Print(o); }
+    void Print(const Option_t *o, TPRegexp&, Int_t) const   { Print(o); }
 
     ClassDef(MLut, 1) // A simple and fast easy-to-use look-up-table
Index: /trunk/MagicSoft/Mars/mbase/MStatusArray.h
===================================================================
--- /trunk/MagicSoft/Mars/mbase/MStatusArray.h	(revision 9489)
+++ /trunk/MagicSoft/Mars/mbase/MStatusArray.h	(revision 9490)
@@ -39,5 +39,8 @@
 
     void Print(Option_t *o="") const;
-    void Print(const Option_t *o, Option_t *) const { Print(o); }
+    void Print(const Option_t *o, Option_t *) const         { Print(o); }
+    void Print(const Option_t *o, Int_t) const              { Print(o); }
+    void Print(const Option_t *o, const char*, Int_t) const { Print(o); }
+    void Print(const Option_t *o, TPRegexp&, Int_t) const   { Print(o); }
 
     TObject *FindObject(const char *object, const char *base) const;
Index: /trunk/MagicSoft/Mars/msimreflector/MReflector.cc
===================================================================
--- /trunk/MagicSoft/Mars/msimreflector/MReflector.cc	(revision 9489)
+++ /trunk/MagicSoft/Mars/msimreflector/MReflector.cc	(revision 9490)
@@ -69,5 +69,5 @@
 void MReflector::SetSigmaPSF(Double_t psf)
 {
-    fMirrors.ForEach(MMirror, SetSigmaPSF)(psf);
+    fMirrors.R__FOR_EACH(MMirror, SetSigmaPSF)(psf);
 }
 
Index: /trunk/MagicSoft/Mars/mtrigger/MTriggerPatternDecode.cc
===================================================================
--- /trunk/MagicSoft/Mars/mtrigger/MTriggerPatternDecode.cc	(revision 9489)
+++ /trunk/MagicSoft/Mars/mtrigger/MTriggerPatternDecode.cc	(revision 9490)
@@ -133,8 +133,4 @@
     fPattern->fUnprescaled = (pattern>>8) & 0xff;
 
-    cout << (int)((pattern>>6)&1) << " " << fPattern->fPrescaled << endl;
-
-    fPattern->Print();
-
     // This is a workaround for the new scheme in which L1TPU (the signal
     // comming directly from the L1 is connected, but the L1 (routed
@@ -150,6 +146,4 @@
     }
 
-    fPattern->Print();
-
     return kTRUE;
 }