Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 7780)
+++ trunk/MagicSoft/Mars/Changelog	(revision 7784)
@@ -18,4 +18,27 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2006/07/11 Thomas Bretz
+
+   *  mbase/MStatusArray.cc, mdata/MDataChain.cc, mdata/MDataFormula.cc,
+      mhflux/MMcSpectrumWeight.cc, mimage/MHillasExt.cc, mjobs/MJCut.cc,
+      msignal/MExtractTimeAndChargeDigitalFilter.cc,
+      mranforest/MRanForestCalc.cc:
+     - fixed some compiler warning of the kind
+         ambiguous overload for `Bool_t ? const char[14] : const TString &'
+       to make gcc 2.95.3 happy (used to get cosy working with the
+       latest Mars version)
+
+   * mastro/MAstroCamera.cc:
+     - removed path from include
+   
+   * mastro/Makefile: 
+     - added directory for MHCamera
+
+   * mhflux/MHThetaSqN.cc:
+      - removed the const-qualifier from the static_cast when setting
+        tghe MParameterD
+
+
 
  2006/07/06 Thomas Bretz
Index: trunk/MagicSoft/Mars/mastro/MAstroCamera.cc
===================================================================
--- trunk/MagicSoft/Mars/mastro/MAstroCamera.cc	(revision 7780)
+++ trunk/MagicSoft/Mars/mastro/MAstroCamera.cc	(revision 7784)
@@ -90,5 +90,5 @@
 #include "MObservatory.h"
 
-#include "../mhist/MHCamera.h" // FIXME: This dependancy is very bad!
+#include "MHCamera.h" // FIXME: This dependancy is very bad!
                       // HOW TO GET RID OF IT? Move MHCamera to mgeom?
 
Index: trunk/MagicSoft/Mars/mastro/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mastro/Makefile	(revision 7780)
+++ trunk/MagicSoft/Mars/mastro/Makefile	(revision 7784)
@@ -19,5 +19,5 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES =  -I. -I../mbase -I../mgeom -I../mtemp -I../mstarcam
+INCLUDES =  -I. -I../mbase -I../mgeom -I../mtemp -I../mstarcam -I../mhist
 # mgeom (MAstroCamera): MGeomCam, MGeomMirror
 
Index: trunk/MagicSoft/Mars/mbase/MStatusArray.cc
===================================================================
--- trunk/MagicSoft/Mars/mbase/MStatusArray.cc	(revision 7780)
+++ trunk/MagicSoft/Mars/mbase/MStatusArray.cc	(revision 7784)
@@ -241,5 +241,5 @@
 
         if (o->InheritsFrom(TVirtualPad::Class()))
-            PrintObjectsInPad(((TVirtualPad*)o)->GetListOfPrimitives(), print?"":name, lvl+1);
+            PrintObjectsInPad(((TVirtualPad*)o)->GetListOfPrimitives(), print?TString():name, lvl+1);
     }
 }
Index: trunk/MagicSoft/Mars/mdata/MDataChain.cc
===================================================================
--- trunk/MagicSoft/Mars/mdata/MDataChain.cc	(revision 7780)
+++ trunk/MagicSoft/Mars/mdata/MDataChain.cc	(revision 7784)
@@ -832,5 +832,5 @@
 TString MDataChain::GetDataMember() const
 {
-    return fMember ? fMember->GetDataMember() : "";
+    return fMember ? fMember->GetDataMember() : TString();
 }
 
Index: trunk/MagicSoft/Mars/mdata/MDataFormula.cc
===================================================================
--- trunk/MagicSoft/Mars/mdata/MDataFormula.cc	(revision 7780)
+++ trunk/MagicSoft/Mars/mdata/MDataFormula.cc	(revision 7784)
@@ -140,5 +140,5 @@
     fFormula = new TFormula;
     // Must have a name otherwise all axis labels disappear like a miracle
-    fFormula->SetName(fName.IsNull()?"TFormula":fName);
+    fFormula->SetName(fName.IsNull()?"TFormula":fName.Data());
 
     if (fFormula->Compile(txt))
Index: trunk/MagicSoft/Mars/mhflux/MHThetaSqN.cc
===================================================================
--- trunk/MagicSoft/Mars/mhflux/MHThetaSqN.cc	(revision 7780)
+++ trunk/MagicSoft/Mars/mhflux/MHThetaSqN.cc	(revision 7784)
@@ -198,5 +198,5 @@
 void MHThetaSqN::SetVal(Double_t val)
 {
-    static_cast<const MParameterD*>(fParameter)->SetVal(val);
+    static_cast<MParameterD*>(fParameter)->SetVal(val);
 }
 
Index: trunk/MagicSoft/Mars/mhflux/MMcSpectrumWeight.cc
===================================================================
--- trunk/MagicSoft/Mars/mhflux/MMcSpectrumWeight.cc	(revision 7780)
+++ trunk/MagicSoft/Mars/mhflux/MMcSpectrumWeight.cc	(revision 7784)
@@ -225,5 +225,5 @@
 TString MMcSpectrumWeight::GetFormulaSpecNew() const
 {
-    TString str = fFormula.IsNull() ? Form("pow(%s.fEnergy, %.3f)", fNameMcEvt.Data(), fNewSlope) : fFormula;
+    TString str = fFormula.IsNull() ? Form("pow(%s.fEnergy, %.3f)", fNameMcEvt.Data(), fNewSlope) : fFormula.Data();
     if (!fFormula.IsNull())
         str.ReplaceAll("X", Form("(%s.fEnergy)", fNameMcEvt.Data()));
Index: trunk/MagicSoft/Mars/mimage/MHillasExt.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MHillasExt.cc	(revision 7780)
+++ trunk/MagicSoft/Mars/mimage/MHillasExt.cc	(revision 7784)
@@ -263,5 +263,5 @@
     const TString name(opt);
 
-    const MHillas *hil = dynamic_cast<const MHillas*>(gPad->FindObject(name.IsNull() ? "MHillas" : name));
+    const MHillas *hil = dynamic_cast<const MHillas*>(gPad->FindObject(name.IsNull() ? "MHillas" : name.Data()));
     if (!hil)
         return;
Index: trunk/MagicSoft/Mars/mjobs/MJCut.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCut.cc	(revision 7780)
+++ trunk/MagicSoft/Mars/mjobs/MJCut.cc	(revision 7784)
@@ -411,5 +411,5 @@
 MH *MJCut::CreateNewHistFS(MParList &plist, const char *name) const
 {
-    const TString cname(fNameHistFS.IsNull()?"MHFalseSource":fNameHistFS);
+    const TString cname(fNameHistFS.IsNull()?"MHFalseSource":fNameHistFS.Data());
 
     TClass *cls = gROOT->GetClass(cname);
Index: trunk/MagicSoft/Mars/mranforest/MRanForestCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mranforest/MRanForestCalc.cc	(revision 7780)
+++ trunk/MagicSoft/Mars/mranforest/MRanForestCalc.cc	(revision 7784)
@@ -137,5 +137,5 @@
     // last entry of your rules
     MDataArray rules(usedrules);
-    rules.AddEntry(ver<3?"Classification":dcol[ncols-1].GetRule());
+    rules.AddEntry(ver<3?"Classification":dcol[ncols-1].GetRule().Data());
 
     // prepare train-matrix finally used
Index: trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc	(revision 7780)
+++ trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc	(revision 7784)
@@ -1296,5 +1296,5 @@
     *fLog << " Window Size HiGain: " << fWindowSizeHiGain        << "  LoGain: " << fWindowSizeLoGain << endl;
     *fLog << " Binning Res HiGain: " << fBinningResolutionHiGain << "  LoGain: " << fBinningResolutionHiGain << endl;
-    *fLog << " Weights File desired: " << (fNameWeightsFile.IsNull()?"-":fNameWeightsFile) << endl;
+    *fLog << " Weights File desired: " << (fNameWeightsFile.IsNull()?"-":fNameWeightsFile.Data()) << endl;
     if (!fNameWeightsFileSet.IsNull())
         *fLog << " Weights File set:     " << fNameWeightsFileSet << endl;