From a11596ada0f7eacece9f6c6de2bc255dca3978aa Mon Sep 17 00:00:00 2001 From: fca Date: Wed, 6 Jun 2012 07:37:34 +0000 Subject: [PATCH] Compatibility with the trunk of root --- TPC/AliSegmentArray.cxx | 3 ++- TPC/AliTPC.h | 1 + TPC/AliTPCAlign.cxx | 2 ++ TPC/AliTPCBuffer.cxx | 3 +++ TPC/AliTPCBuffer.h | 1 + TPC/AliTPCCalibViewer.cxx | 1 + TPC/AliTPCConfigDA.cxx | 2 +- TPC/AliTPCConfigParser.cxx | 1 + TPC/AliTPCDDLRawData.cxx | 1 + TPC/AliTPCDigitizer.cxx | 3 +++ TPC/AliTPCLaserTracks.cxx | 2 ++ TPC/AliTPCPid.cxx | 2 ++ TPC/AliTPCclustererKr.cxx | 4 ++++ TPC/AliTPCclustererMI.cxx | 2 ++ TPC/AliTPCtrackerMI.cxx | 2 ++ TPC/AliTPCv0.cxx | 3 +++ TPC/AliTPCv1.cxx | 3 +++ TPC/AliTPCv2.cxx | 2 ++ TPC/AliTPCv3.cxx | 2 ++ TPC/AliTPCv4.cxx | 2 ++ 20 files changed, 40 insertions(+), 2 deletions(-) diff --git a/TPC/AliSegmentArray.cxx b/TPC/AliSegmentArray.cxx index 61b97b0a8a0..5b7166dad97 100644 --- a/TPC/AliSegmentArray.cxx +++ b/TPC/AliSegmentArray.cxx @@ -37,7 +37,8 @@ #include "AliSegmentArray.h" #include "TObjString.h" - +using std::endl; +using std::cout; //_____________________________________________________________________________ ClassImp(AliSegmentArray) diff --git a/TPC/AliTPC.h b/TPC/AliTPC.h index 3fc8a729924..c36d975cf83 100644 --- a/TPC/AliTPC.h +++ b/TPC/AliTPC.h @@ -26,6 +26,7 @@ class TTreeSRedirector; #include "AliDigit.h" #include "AliHit.h" +using std::fstream; class AliTPC : public AliDetector { diff --git a/TPC/AliTPCAlign.cxx b/TPC/AliTPCAlign.cxx index 3286c86fa80..911b63bd681 100644 --- a/TPC/AliTPCAlign.cxx +++ b/TPC/AliTPCAlign.cxx @@ -49,6 +49,8 @@ Class creating the aligmnent object fro the surveyor measurements. #include "AliLog.h" #include "AliCDBManager.h" +using std::cout; +using std::endl; ClassImp(AliTPCAlign) AliTPCAlign::AliTPCAlign() : diff --git a/TPC/AliTPCBuffer.cxx b/TPC/AliTPCBuffer.cxx index 25f7615bd87..fdbdb72a228 100644 --- a/TPC/AliTPCBuffer.cxx +++ b/TPC/AliTPCBuffer.cxx @@ -28,6 +28,9 @@ //#include "TFile.h" //#include "TTree.h" +using std::ios; +using std::ofstream; +using std::endl; ClassImp(AliTPCBuffer) ////////////////////////////////////////////////////////////////////////////////////////////////////////////// //___________________________________________________________ diff --git a/TPC/AliTPCBuffer.h b/TPC/AliTPCBuffer.h index bd110ad0eb8..0dca48edc29 100644 --- a/TPC/AliTPCBuffer.h +++ b/TPC/AliTPCBuffer.h @@ -13,6 +13,7 @@ class fstream; #include "Riostream.h" #endif +using std::fstream; class AliSimDigits; //class TTree; diff --git a/TPC/AliTPCCalibViewer.cxx b/TPC/AliTPCCalibViewer.cxx index 5182ab0a738..6b95b694726 100644 --- a/TPC/AliTPCCalibViewer.cxx +++ b/TPC/AliTPCCalibViewer.cxx @@ -70,6 +70,7 @@ // #include "AliTPCCalibViewer.h" +using std::ifstream; ClassImp(AliTPCCalibViewer) diff --git a/TPC/AliTPCConfigDA.cxx b/TPC/AliTPCConfigDA.cxx index e86e9b308e7..758129b0ed5 100644 --- a/TPC/AliTPCConfigDA.cxx +++ b/TPC/AliTPCConfigDA.cxx @@ -40,7 +40,7 @@ //header #include "AliTPCConfigDA.h" - +using std::ifstream; AliTPCConfigDA::AliTPCConfigDA() : TObject(), diff --git a/TPC/AliTPCConfigParser.cxx b/TPC/AliTPCConfigParser.cxx index f9261bbc0a1..aa8b4a52e09 100644 --- a/TPC/AliTPCConfigParser.cxx +++ b/TPC/AliTPCConfigParser.cxx @@ -42,6 +42,7 @@ //header #include "AliTPCConfigParser.h" +using std::ifstream; AliTPCConfigParser::AliTPCConfigParser() : TObject(), diff --git a/TPC/AliTPCDDLRawData.cxx b/TPC/AliTPCDDLRawData.cxx index 0358842b5fc..29e646265b0 100644 --- a/TPC/AliTPCDDLRawData.cxx +++ b/TPC/AliTPCDDLRawData.cxx @@ -33,6 +33,7 @@ #include "AliTPCDDLRawData.h" #include "AliDAQ.h" +using std::ios; ClassImp(AliTPCDDLRawData) //////////////////////////////////////////////////////////////////////////////////////// diff --git a/TPC/AliTPCDigitizer.cxx b/TPC/AliTPCDigitizer.cxx index 0bee1a63e12..6006c800e57 100644 --- a/TPC/AliTPCDigitizer.cxx +++ b/TPC/AliTPCDigitizer.cxx @@ -56,6 +56,9 @@ #include "AliTPCCalPad.h" #include "AliTPCCalROC.h" +using std::cout; +using std::cerr; +using std::endl; ClassImp(AliTPCDigitizer) //___________________________________________ diff --git a/TPC/AliTPCLaserTracks.cxx b/TPC/AliTPCLaserTracks.cxx index bedb8a009c7..7767f59c730 100644 --- a/TPC/AliTPCLaserTracks.cxx +++ b/TPC/AliTPCLaserTracks.cxx @@ -63,6 +63,8 @@ // Class AliTPCLaserTracks //////////////////////////////////////////////////////////////////////// +using std::cout; +using std::endl; ClassImp(AliTPCLaserTracks) AliTPCLaserTracks::AliTPCLaserTracks():TObject(), diff --git a/TPC/AliTPCPid.cxx b/TPC/AliTPCPid.cxx index 3d7d3c34a68..ba47b3e5ffd 100644 --- a/TPC/AliTPCPid.cxx +++ b/TPC/AliTPCPid.cxx @@ -25,6 +25,8 @@ #include "Riostream.h" #include +using std::cout; +using std::endl; ClassImp(AliTPCPid) // Correction 13.01.2003 Z.S.,Dubna // 22.01.2003 diff --git a/TPC/AliTPCclustererKr.cxx b/TPC/AliTPCclustererKr.cxx index 442585c04aa..8c1eba17d99 100644 --- a/TPC/AliTPCclustererKr.cxx +++ b/TPC/AliTPCclustererKr.cxx @@ -233,6 +233,10 @@ delete stream; #include "AliTPCCalROC.h" #include "AliRawEventHeaderBase.h" +using std::cerr; +using std::cout; +using std::endl; +using std::list; ClassImp(AliTPCclustererKr) diff --git a/TPC/AliTPCclustererMI.cxx b/TPC/AliTPCclustererMI.cxx index 204ab140397..8b481f7b859 100644 --- a/TPC/AliTPCclustererMI.cxx +++ b/TPC/AliTPCclustererMI.cxx @@ -82,6 +82,8 @@ #include "AliTPCTransform.h" #include "AliTPCclustererMI.h" +using std::cerr; +using std::endl; ClassImp(AliTPCclustererMI) diff --git a/TPC/AliTPCtrackerMI.cxx b/TPC/AliTPCtrackerMI.cxx index 4d5f0631fcc..16a9d47dcb3 100644 --- a/TPC/AliTPCtrackerMI.cxx +++ b/TPC/AliTPCtrackerMI.cxx @@ -149,6 +149,8 @@ // +using std::cerr; +using std::endl; ClassImp(AliTPCtrackerMI) diff --git a/TPC/AliTPCv0.cxx b/TPC/AliTPCv0.cxx index a5d0e5ce2c8..1130e14660c 100644 --- a/TPC/AliTPCv0.cxx +++ b/TPC/AliTPCv0.cxx @@ -50,6 +50,9 @@ #include "TGeoTrd1.h" #include "TGeoCompositeShape.h" #include "TGeoPara.h" + +using std::ifstream; +using std::ios_base; ClassImp(AliTPCv0) //_____________________________________________________________________________ diff --git a/TPC/AliTPCv1.cxx b/TPC/AliTPCv1.cxx index f5745e45be4..f6461596b25 100644 --- a/TPC/AliTPCv1.cxx +++ b/TPC/AliTPCv1.cxx @@ -54,6 +54,9 @@ #include "TGeoTrd1.h" #include "TGeoCompositeShape.h" #include "TGeoPara.h" + +using std::ifstream; +using std::ios_base; ClassImp(AliTPCv1) //_____________________________________________________________________________ diff --git a/TPC/AliTPCv2.cxx b/TPC/AliTPCv2.cxx index 2254b1ebba8..c3dddce6c99 100644 --- a/TPC/AliTPCv2.cxx +++ b/TPC/AliTPCv2.cxx @@ -53,6 +53,8 @@ #include "TGeoHalfSpace.h" #include "TTreeStream.h" +using std::ifstream; +using std::ios_base; ClassImp(AliTPCv2) //_____________________________________________________________________________ diff --git a/TPC/AliTPCv3.cxx b/TPC/AliTPCv3.cxx index f96612d5a2c..072c8ecf13d 100644 --- a/TPC/AliTPCv3.cxx +++ b/TPC/AliTPCv3.cxx @@ -58,6 +58,8 @@ #include "TGeoCompositeShape.h" #include "TGeoPara.h" +using std::ifstream; +using std::ios_base; ClassImp(AliTPCv3) //_____________________________________________________________________________ diff --git a/TPC/AliTPCv4.cxx b/TPC/AliTPCv4.cxx index 80004c746fd..e6968cea625 100644 --- a/TPC/AliTPCv4.cxx +++ b/TPC/AliTPCv4.cxx @@ -55,6 +55,8 @@ TPC version for the krypton runs (Marek) #include "TGeoPara.h" #include "TGeoPhysicalNode.h" +using std::ifstream; +using std::ios_base; ClassImp(AliTPCv4) //_____________________________________________________________________________ -- 2.43.0