Removing obsolete macros

[u/mrichter/AliRoot.git] / ITS / AliITSgeomMatrix.cxx

diff --git a/ITS/AliITSgeomMatrix.cxx b/ITS/AliITSgeomMatrix.cxx
index b9f6f234a13214cd4b75fec1a30beb18f5b01b21..144eccc51d450f1d8e82adc7fc0d9b5b185b014d 100644 (file)
--- a/ITS/AliITSgeomMatrix.cxx
+++ b/ITS/AliITSgeomMatrix.cxx
@@ -15,6 +15,25 @@
 
 /*
 $Log$
+Revision 1.17  2002/10/31 10:16:40  hristov
+Minor corrections for warnings on Alpha
+
+Revision 1.16  2002/10/22 14:45:40  alibrary
+Introducing Riostream.h
+
+Revision 1.15  2002/10/14 14:57:00  hristov
+Merging the VirtualMC branch to the main development branch (HEAD)
+
+Revision 1.13.6.1  2002/06/10 17:51:15  hristov
+Merged with v3-08-02
+
+Revision 1.14  2002/05/19 18:17:03  hristov
+Changes needed by ICC/IFC compiler (Intel)
+
+Revision 1.13  2002/01/28 21:49:19  nilsen
+Fixed a logical bug in functions GtoLPositionError, LtoGPositionError,
+GtoLPositionErrorTracking, and LtoGPositionErrorTracking.
+
 Revision 1.12  2001/10/12 22:07:20  nilsen
 A patch for C++ io manipulation functions so that they will work both
 with GNU gcc 2.96 and GNU gcc 3.01 compilers. Needs to be tested with
@@ -77,8 +96,7 @@ A new class to hold the matrix information needed by AliITSgeom.
 // specific local coordinates (cm).
 ////////////////////////////////////////////////////////////////////////
 
-#include <iostream.h>
-#include <iomanip.h>
+#include <Riostream.h>
 #include <TMath.h>
 #include <TBuffer.h>
 #include <TClass.h>
@@ -554,7 +572,6 @@ void AliITSgeomMatrix::GtoLMomentumTracking(const Double_t g[3],
        l[2] = +l0[2];
     } // end if
     return;
-       return;
 }
 //----------------------------------------------------------------------
 void AliITSgeomMatrix::LtoGMomentumTracking(const Double_t l[3],
@@ -694,8 +711,12 @@ void AliITSgeomMatrix::Print(ostream *os){
 #else
     Int_t fmt;
 #endif
+#else
+#if defined __ICC || defined __ECC
+    ios::fmtflags fmt;
 #else
     Int_t fmt;
+#endif
 #endif
 
     fmt = os->setf(ios::scientific);  // set scientific floating point output