Removing warnings (icc)

[u/mrichter/AliRoot.git] / STEER / AliMagFCM.h

diff --git a/STEER/AliMagFCM.h b/STEER/AliMagFCM.h
index f7196fe6e99304d7ea0311c6a39ba8fdbf2b9bce..6985e4d8faf73fb5f4ca8661d87deb92a026d952 100644 (file)
--- a/STEER/AliMagFCM.h
+++ b/STEER/AliMagFCM.h
@@ -5,15 +5,15 @@
 
 /* $Id$ */
 
-#include "AliMagF.h"
+#include "AliMagFC.h"
 class TVector;
 
-class AliMagFCM : public AliMagF
+class AliMagFCM : public AliMagFC
 {
-  //Alice Magnetic Field with constan mesh
+  //Alice Magnetic Field with constant mesh
 
 public:
-  AliMagFCM(){fB=0;}
+  AliMagFCM();
   AliMagFCM(const char *name, const char *title, const Int_t integ,
           const Float_t factor, const Float_t fmax);
   AliMagFCM(const AliMagFCM &mag);
@@ -21,10 +21,11 @@ public:
   virtual void Field(Float_t *x, Float_t *b);
   virtual void ReadField();
   virtual void    SetSolenoidField(Float_t field = 2.) {fSolenoid = field;}
-  virtual Float_t SolenoidField() {return fSolenoid;}
+  virtual Float_t SolenoidField() const {return fSolenoid;}
   
-  void Copy(AliMagFCM &magf) const;
-  virtual AliMagFCM & operator=(const AliMagFCM &magf);
+  void Copy(TObject &magf) const;
+  virtual AliMagFCM & operator=(const AliMagFCM &magf)
+    {magf.Copy(*this); return *this;}
 
   Float_t Bx(const Int_t ix, const Int_t iy, const Int_t iz) {
     return (*fB)(3*(iz*(fXn*fYn)+iy*fXn+ix));