correcting placement of 'using' statements (Thorsten)

diff --git a/HLT/TPCLib/AliHLTTPCClusterConverterComponent.cxx b/HLT/TPCLib/AliHLTTPCClusterConverterComponent.cxx
index c256d080a6ca81de35057d7716f5391016ef5c17..9012601ddb27bf8163591ef4cde990b67ea2b75b 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCClusterConverterComponent.cxx
+++ b/HLT/TPCLib/AliHLTTPCClusterConverterComponent.cxx
@@ -28,10 +28,6 @@
 // or
 // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt
 
-#if __GNUC__>= 3
-using namespace std;
-#endif
-
 #include "AliHLTTPCClusterConverterComponent.h"
 #include "AliHLTTPCOfflineCluster.h"
 #include "AliTPCclusterMI.h"
@@ -54,6 +50,8 @@ using namespace std;
 //#include <stdlib.h>
 //#include <cerrno>
 
+using namespace std;
+
 /** ROOT macro for the implementation of ROOT specific class methods */
 ClassImp(AliHLTTPCClusterConverterComponent)
 

diff --git a/HLT/TPCLib/AliHLTTPCClusterFinderComponent.cxx b/HLT/TPCLib/AliHLTTPCClusterFinderComponent.cxx
index 2880d8c16de317bb022d3be5376861b5bfc7a6b8..ad42f5ec5e0a4431c92a68f4d5c146ff938ae070 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCClusterFinderComponent.cxx
+++ b/HLT/TPCLib/AliHLTTPCClusterFinderComponent.cxx
@@ -23,9 +23,6 @@
     @brief  The TPC cluster finder processing component
 */
 
-#if __GNUC__>= 3
-using namespace std;
-#endif
 #include "AliHLTTPCClusterFinderComponent.h"
 #include "AliHLTTPCDigitReaderUnpacked.h"
 #include "AliHLTTPCDigitReader32Bit.h"
@@ -60,6 +57,8 @@ using namespace std;
 
 #include <sys/time.h>
 
+using namespace std;
+
 /** ROOT macro for the implementation of ROOT specific class methods */
 ClassImp(AliHLTTPCClusterFinderComponent)
 

diff --git a/HLT/TPCLib/AliHLTTPCClusters.cxx b/HLT/TPCLib/AliHLTTPCClusters.cxx
index 7fc16798744da53fa53a285a8de485a921034af9..f81b5ac97654bf4ff1b2f480f46fc6772fd2fe47 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCClusters.cxx
+++ b/HLT/TPCLib/AliHLTTPCClusters.cxx
@@ -1,7 +1,3 @@
-#if __GNUC__>= 3
-using namespace std;
-#endif
-
 // see header file for class documentation
 // or
 // refer to README to build package
@@ -19,6 +15,8 @@ using namespace std;
 //#include <vector>
 #include "AliHLTTPCClusters.h"
 
+using namespace std;
+
 /** ROOT macro for the implementation of ROOT specific class methods */
 ClassImp(AliHLTTPCClusters)
 

diff --git a/HLT/TPCLib/AliHLTTPCDigitReader.cxx b/HLT/TPCLib/AliHLTTPCDigitReader.cxx
index de3ef49930975f976220f975e180195e07bfe67b..a6e382e8b7e09c014593dda4e654fb00ad83f636 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCDigitReader.cxx
+++ b/HLT/TPCLib/AliHLTTPCDigitReader.cxx
@@ -30,14 +30,12 @@
 // or
 // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt
 
-#if __GNUC__>= 3
-using namespace std;
-#endif
-
 #include "AliHLTTPCDigitReader.h"
 #include "AliHLTTPCTransform.h"
 #include "AliHLTStdIncludes.h"
 
+using namespace std;
+
 ClassImp(AliHLTTPCDigitReader)
 
 AliHLTTPCDigitReader::AliHLTTPCDigitReader()

diff --git a/HLT/TPCLib/AliHLTTPCDigitReader32Bit.cxx b/HLT/TPCLib/AliHLTTPCDigitReader32Bit.cxx
index 76b27a09f98e8ec4bd9be43b2ffb04c4c33a2f87..e19f68a26ef34a1034d1792a3da63d864f6b18d7 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCDigitReader32Bit.cxx
+++ b/HLT/TPCLib/AliHLTTPCDigitReader32Bit.cxx
@@ -23,10 +23,6 @@
 /// @brief  DigitReader implementation for the 32 bit offline decoder
 ///
 
-#if __GNUC__>= 3
-using namespace std;
-#endif
-
 #include <cassert>
 #include "AliHLTTPCDigitReader32Bit.h"
 #include "AliHLTTPCMapping.h"
@@ -34,6 +30,8 @@ using namespace std;
 #include "AliRawReaderMemory.h"
 #include "AliAltroRawStreamV3.h"
 
+using namespace std;
+
 ClassImp(AliHLTTPCDigitReader32Bit)
 
 AliHLTTPCDigitReader32Bit::AliHLTTPCDigitReader32Bit()

diff --git a/HLT/TPCLib/AliHLTTPCDigitReaderUnpacked.cxx b/HLT/TPCLib/AliHLTTPCDigitReaderUnpacked.cxx
index ca87b6d5871bbf66a2d901fc128cd6c82b4abf37..85fbb454fdd8dc3f6b3c835a6c8f391818ede9fe 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCDigitReaderUnpacked.cxx
+++ b/HLT/TPCLib/AliHLTTPCDigitReaderUnpacked.cxx
@@ -24,10 +24,6 @@
     @brief  A digit reader implementation for unpacked TPC data.
 */
 
-#if __GNUC__== 3
-using namespace std;
-#endif
-
 #include <cassert>
 #include "AliHLTTPCDigitReaderUnpacked.h"
 #include "AliHLTTPCDigitData.h"
@@ -35,6 +31,8 @@ using namespace std;
 #include "AliHLTStdIncludes.h"
 #include "AliHLTTPCMapping.h"
 
+using namespace std;
+
 ClassImp(AliHLTTPCDigitReaderUnpacked)
 
 AliHLTTPCDigitReaderUnpacked::AliHLTTPCDigitReaderUnpacked()

diff --git a/HLT/TPCLib/AliHLTTPCHWCFDataReverterComponent.cxx b/HLT/TPCLib/AliHLTTPCHWCFDataReverterComponent.cxx
index 639e07549aeeeff27dceb7da33a90bbcb1b7e0ce..d9b6a99466a4d2e9848717b216813d50f7f87223 100755 (executable)
--- a/HLT/TPCLib/AliHLTTPCHWCFDataReverterComponent.cxx
+++ b/HLT/TPCLib/AliHLTTPCHWCFDataReverterComponent.cxx
@@ -27,9 +27,6 @@
 // or                                                                        //
 // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt                          //
 
-#if __GNUC__>= 3
-using namespace std;
-#endif
 #include "AliHLTTPCHWCFDataReverterComponent.h"
 #include "AliHLTTPCDigitReader32Bit.h"
 #include "AliHLTTPCTransform.h"
@@ -44,6 +41,8 @@ using namespace std;
 #include "AliHLTAltroEncoder.h"
 #include "AliRawDataHeader.h"
 
+using namespace std;
+
 /** ROOT macro for the implementation of ROOT specific class methods */
 ClassImp(AliHLTTPCHWCFDataReverterComponent)
 

diff --git a/HLT/TPCLib/AliHLTTPCHWClusterTransformComponent.cxx b/HLT/TPCLib/AliHLTTPCHWClusterTransformComponent.cxx
index cb19254624d488062b03125a5a6ea4a2f83beb75..b5aa0f3622d97a9bca20a6f7ee9614fe47b6b269 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCHWClusterTransformComponent.cxx
+++ b/HLT/TPCLib/AliHLTTPCHWClusterTransformComponent.cxx
@@ -22,9 +22,6 @@
     @brief 
 */
 
-#if __GNUC__>= 3
-using namespace std;
-#endif
 #include "AliHLTTPCHWClusterTransformComponent.h"
 #include "AliHLTTPCDefinitions.h"
 #include "AliHLTTPCTransform.h"
@@ -46,6 +43,8 @@ using namespace std;
 #include <cerrno>
 #include <sys/time.h>
 
+using namespace std;
+
 ClassImp(AliHLTTPCHWClusterTransformComponent) //ROOT macro for the implementation of ROOT specific class methods
 
 const char* AliHLTTPCHWClusterTransformComponent::fgkOCDBEntryHWTransform="HLT/ConfigTPC/TPCHWClusterTransform";

diff --git a/HLT/TPCLib/AliHLTTPCHistogramHandlerComponent.cxx b/HLT/TPCLib/AliHLTTPCHistogramHandlerComponent.cxx
index 8aa1ed20deb9322dc3b7ae5311102bee8e561b79..f17f0a6954bef420c93bf52f0744344f4558c526 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCHistogramHandlerComponent.cxx
+++ b/HLT/TPCLib/AliHLTTPCHistogramHandlerComponent.cxx
@@ -21,9 +21,6 @@
     @brief  The Histogram Handler component
 */
 
-#if __GNUC__>= 3
-using namespace std;
-#endif
 #include "AliHLTTPCHistogramHandlerComponent.h"
 #include "AliHLTTPCDefinitions.h"
 #include "AliCDBEntry.h"
@@ -42,6 +39,8 @@ using namespace std;
 #include "TLine.h"
 #include "TMath.h"
 
+using namespace std;
+
 ClassImp(AliHLTTPCHistogramHandlerComponent) //ROOT macro for the implementation of ROOT specific class methods
 
   AliHLTTPCHistogramHandlerComponent::AliHLTTPCHistogramHandlerComponent()

diff --git a/HLT/TPCLib/AliHLTTPCMapping.cxx b/HLT/TPCLib/AliHLTTPCMapping.cxx
index d70e36b61d449d73cd935775212d0256ea2c69c8..c5babee32eb57ee6a513f0c47f633bae296c3408 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCMapping.cxx
+++ b/HLT/TPCLib/AliHLTTPCMapping.cxx
@@ -27,13 +27,12 @@
 // or                                                                        //
 // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt                          //
 
-#if __GNUC__>= 3
-using namespace std;
-#endif
 #include <cassert>
 #include "AliHLTTPCMapping.h"
 #include "AliHLTTPCTransform.h"
 
+using namespace std;
+
 ClassImp(AliHLTTPCMapping)
 
 AliHLTTPCMapping::AliHLTTPCMapping(UInt_t patch)

diff --git a/HLT/TPCLib/AliHLTTPCRawDataUnpackerComponent.cxx b/HLT/TPCLib/AliHLTTPCRawDataUnpackerComponent.cxx
index f8b08f57104e444b4ea684668f0948dbb139ac57..967d502e124fdb2ea605ccbcf61620b3db285674 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCRawDataUnpackerComponent.cxx
+++ b/HLT/TPCLib/AliHLTTPCRawDataUnpackerComponent.cxx
@@ -29,10 +29,6 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#if __GNUC__>= 3
-using namespace std;
-#endif
-
 #include "AliHLTTPCRawDataUnpackerComponent.h"
 #include "AliTPCRawStream.h"
 #include "AliRawDataHeader.h"
@@ -43,6 +39,8 @@ using namespace std;
 #include <cstdlib>
 #include <cerrno>
 
+using namespace std;
+
 /** ROOT macro for the implementation of ROOT specific class methods */
 ClassImp(AliHLTTPCRawDataUnpackerComponent);
 

diff --git a/HLT/TPCLib/AliHLTTPCTrackGeometry.cxx b/HLT/TPCLib/AliHLTTPCTrackGeometry.cxx
index ec5b11d67f3c2c267735a121b404fd1a96b02a4e..67866af626313f277437c026e1a527f94558f645 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCTrackGeometry.cxx
+++ b/HLT/TPCLib/AliHLTTPCTrackGeometry.cxx
@@ -121,6 +121,9 @@ int AliHLTTPCTrackGeometry::CalculateTrackPoints(const AliHLTExternalTrackParam&
 int AliHLTTPCTrackGeometry::CalculateTrackPoints(AliHLTGlobalBarrelTrack& track)
 {
   /// calculate the track points, expects the global magnetic field to be initialized
+  /// depending on the x coordinate of the first track point the corresponding padrow
+  /// is searched and the points are calculated outwards. Eventually the points are
+  /// calculated inwards as a second step.
   int iResult=0;
   int firstpadrow=0;
   for (;
@@ -128,8 +131,10 @@ int AliHLTTPCTrackGeometry::CalculateTrackPoints(AliHLTGlobalBarrelTrack& track)
         AliHLTTPCTransform::Row2X(firstpadrow)+AliHLTTPCTransform::GetPadLength(firstpadrow)<track.GetX();
        firstpadrow++);
   if (firstpadrow>=AliHLTTPCTransform::GetNRows()) return 0;
+  // first calculated outwards
   iResult=CalculateTrackPoints(track, firstpadrow, 1);
   if (iResult>=0 && firstpadrow>0)
+    // now calculate inwards
     iResult=CalculateTrackPoints(track, firstpadrow-1, -1);
   return iResult;
 }

diff --git a/HLT/TPCLib/AliHLTTPCdEdxMonitoringComponent.cxx b/HLT/TPCLib/AliHLTTPCdEdxMonitoringComponent.cxx
index 466889c5b1e39ab21e9cdc8ba0546e33d834ecde..95771481bad85ac61caeabc7aa0164947963cd18 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCdEdxMonitoringComponent.cxx
+++ b/HLT/TPCLib/AliHLTTPCdEdxMonitoringComponent.cxx
@@ -22,11 +22,6 @@
 /// @brief  Component for reading ESD from chain and produce a dEdx monitoring plot
 ///
 
-#if __GNUC__>= 3
-using namespace std;
-#endif
-
-
 #include "TSystem.h"
 #include "AliESDtrackCuts.h"
 #include <AliHLTDAQ.h>
@@ -44,6 +39,8 @@ using namespace std;
 
 #include "AliHLTTPCdEdxMonitoringComponent.h"
 
+using namespace std;
+
 /** ROOT macro for the implementation of ROOT specific class methods */
 ClassImp( AliHLTTPCdEdxMonitoringComponent )
   

diff --git a/HLT/TPCLib/HWCFemulator/AliHLTTPCHWCFConsistencyControlComponent.cxx b/HLT/TPCLib/HWCFemulator/AliHLTTPCHWCFConsistencyControlComponent.cxx
index 2049d740de334976a850d16abbedd43589714608..a9fbb8aa702f80acc74a02043eb163aa77753cd5 100644 (file)
--- a/HLT/TPCLib/HWCFemulator/AliHLTTPCHWCFConsistencyControlComponent.cxx
+++ b/HLT/TPCLib/HWCFemulator/AliHLTTPCHWCFConsistencyControlComponent.cxx
@@ -24,9 +24,6 @@
 //  @note
 
 
-#if __GNUC__>= 3
-using namespace std;
-#endif
 #include "AliHLTTPCHWCFConsistencyControlComponent.h"
 
 #include "AliHLTTPCDefinitions.h"
@@ -47,6 +44,8 @@ using namespace std;
 #include <sys/time.h>
 #include "TFile.h"
 
+using namespace std;
+
 AliHLTTPCHWCFConsistencyControlComponent::AliHLTTPCHWCFConsistencyControlComponent()
   :
   AliHLTProcessor(),

diff --git a/HLT/TPCLib/HWCFemulator/AliHLTTPCHWCFEmulatorComponent.cxx b/HLT/TPCLib/HWCFemulator/AliHLTTPCHWCFEmulatorComponent.cxx
index 4cb5a66f35a30bd4efd453c9339fcadd2c24f579..a40b0057299d731f33ce4542831b020654d6c03f 100644 (file)
--- a/HLT/TPCLib/HWCFemulator/AliHLTTPCHWCFEmulatorComponent.cxx
+++ b/HLT/TPCLib/HWCFemulator/AliHLTTPCHWCFEmulatorComponent.cxx
@@ -25,9 +25,6 @@
 //  @note
 
 
-#if __GNUC__>= 3
-using namespace std;
-#endif
 #include "AliHLTTPCHWCFEmulatorComponent.h"
 
 #include "AliHLTTPCDefinitions.h"
@@ -50,6 +47,8 @@ using namespace std;
 #include <sys/time.h>
 #include "TFile.h"
 
+using namespace std;
+
 AliHLTTPCHWCFEmulatorComponent::AliHLTTPCHWCFEmulatorComponent()
   :
   AliHLTProcessor(),

diff --git a/HLT/TPCLib/HWCFemulator/AliHLTTPCHWCFSupport.cxx b/HLT/TPCLib/HWCFemulator/AliHLTTPCHWCFSupport.cxx
index 6060f4ec6ce614f54170a06be6afdddd6a0df259..f913076c85329f146fffefe914b5f1b139cb3b46 100644 (file)
--- a/HLT/TPCLib/HWCFemulator/AliHLTTPCHWCFSupport.cxx
+++ b/HLT/TPCLib/HWCFemulator/AliHLTTPCHWCFSupport.cxx
@@ -38,15 +38,12 @@
 #include "AliTPCCalROC.h"
 #include "TMath.h"
 
-#if __GNUC__>= 3
-using namespace std;
-#endif
-
 #include <cstdlib>
 #include <algorithm>
 #include <cerrno>
 #include <sys/time.h>
 
+using namespace std;
 
 AliHLTTPCHWCFSupport::AliHLTTPCHWCFSupport()
   : 

diff --git a/HLT/TPCLib/calibration/AliHLTTPCAnalysisTaskcalib.cxx b/HLT/TPCLib/calibration/AliHLTTPCAnalysisTaskcalib.cxx
index 6778f2a516be01d065dac29ea05329bf9dad1f68..24e3303c817bc57fb2307ed7edbb283218c745a4 100644 (file)
--- a/HLT/TPCLib/calibration/AliHLTTPCAnalysisTaskcalib.cxx
+++ b/HLT/TPCLib/calibration/AliHLTTPCAnalysisTaskcalib.cxx
@@ -27,10 +27,6 @@
 // or
 // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt   
 
-#if __GNUC__>= 3
-using namespace std;
-#endif
-
 #include "AliHLTTPCAnalysisTaskcalib.h"
 #include "AliTPCcalibBase.h"
 #include "AliESDEvent.h"
@@ -47,6 +43,8 @@ using namespace std;
 #include "TTimeStamp.h"
 #include "TChain.h"
 
+using namespace std;
+
 ClassImp(AliHLTTPCAnalysisTaskcalib)
 
 AliHLTTPCAnalysisTaskcalib::AliHLTTPCAnalysisTaskcalib()

diff --git a/HLT/TPCLib/calibration/AliHLTTPCCalibCEComponent.cxx b/HLT/TPCLib/calibration/AliHLTTPCCalibCEComponent.cxx
index cb83c4ebc299c7a62b4afd02f910dd3a6433e796..e5f23f1be52a3e32dc708cb115d4d41796973464 100644 (file)
--- a/HLT/TPCLib/calibration/AliHLTTPCCalibCEComponent.cxx
+++ b/HLT/TPCLib/calibration/AliHLTTPCCalibCEComponent.cxx
@@ -27,10 +27,6 @@
 // or
 // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt   
 
-#if __GNUC__>= 3
-using namespace std;
-#endif
-
 //#include "AliHLTTPCLogging.h"
 #include "AliHLTTPCDefinitions.h"
 //#include "AliHLTTPCTransform.h"
@@ -47,6 +43,8 @@ using namespace std;
 #include <cerrno>
 #include "TString.h"
 
+using namespace std;
+
 /** ROOT macro for the implementation of ROOT specific class methods */
 ClassImp(AliHLTTPCCalibCEComponent)
 

diff --git a/HLT/TPCLib/calibration/AliHLTTPCCalibPedestalComponent.cxx b/HLT/TPCLib/calibration/AliHLTTPCCalibPedestalComponent.cxx
index 57287dccc1c039dbc2e9a991b7d246967dc77ca3..e7423098881a89a2c2cd03afdd00fefb8384cca1 100755 (executable)
--- a/HLT/TPCLib/calibration/AliHLTTPCCalibPedestalComponent.cxx
+++ b/HLT/TPCLib/calibration/AliHLTTPCCalibPedestalComponent.cxx
@@ -26,10 +26,6 @@
 // or
 // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt   
 
-#if __GNUC__>= 3
-using namespace std;
-#endif
-
 #include "AliHLTTPCLogging.h"
 #include "AliHLTTPCTransform.h"
 
@@ -45,6 +41,8 @@ using namespace std;
 #include <errno.h>
 #include "TString.h"
 
+using namespace std;
+
 /** ROOT macro for the implementation of ROOT specific class methods */
 ClassImp(AliHLTTPCCalibPedestalComponent)
 

diff --git a/HLT/TPCLib/calibration/AliHLTTPCCalibPulserComponent.cxx b/HLT/TPCLib/calibration/AliHLTTPCCalibPulserComponent.cxx
index 09bf1c4a0e31819845ea54e794e284a8a56fb9f2..a926dd0dcd8f3ae7a27d3329f4cf50a985b1138d 100644 (file)
--- a/HLT/TPCLib/calibration/AliHLTTPCCalibPulserComponent.cxx
+++ b/HLT/TPCLib/calibration/AliHLTTPCCalibPulserComponent.cxx
@@ -26,10 +26,6 @@
 // or
 // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt   
 
-#if __GNUC__>= 3
-using namespace std;
-#endif
-
 #include "AliHLTTPCLogging.h"
 #include "AliHLTTPCTransform.h"
 
@@ -47,6 +43,8 @@ using namespace std;
 #include <errno.h>
 #include "TString.h"
 
+using namespace std;
+
 /** ROOT macro for the implementation of ROOT specific class methods */
 ClassImp(AliHLTTPCCalibPulserComponent)
 

diff --git a/HLT/TPCLib/calibration/AliHLTTPCCalibSeedMakerComponent.cxx b/HLT/TPCLib/calibration/AliHLTTPCCalibSeedMakerComponent.cxx
index 5e7d2c4c7da6a08a8fc67d7bfac7b0b427063db0..2685da85d5cbb6736db05c098109f4a598273b5a 100644 (file)
--- a/HLT/TPCLib/calibration/AliHLTTPCCalibSeedMakerComponent.cxx
+++ b/HLT/TPCLib/calibration/AliHLTTPCCalibSeedMakerComponent.cxx
@@ -22,10 +22,6 @@
     @brief  
 */
 
-#if __GNUC__>= 3
-using namespace std;
-#endif
-
 #include <map>
 
 #include "AliHLTTPCCalibSeedMakerComponent.h"
@@ -60,6 +56,8 @@ using namespace std;
 
 #include <sys/time.h>
 
+using namespace std;
+
 ClassImp(AliHLTTPCCalibSeedMakerComponent) //ROOT macro for the implementation of ROOT specific class methods
 
 AliHLTTPCCalibSeedMakerComponent::AliHLTTPCCalibSeedMakerComponent()

diff --git a/HLT/TPCLib/calibration/AliHLTTPCCalibTimeComponent.cxx b/HLT/TPCLib/calibration/AliHLTTPCCalibTimeComponent.cxx
index 60f810703b308f76445d2ec77a5076989f77622e..c8b3b9e34b736a7749df9e5c286df7a12f0ae062 100644 (file)
--- a/HLT/TPCLib/calibration/AliHLTTPCCalibTimeComponent.cxx
+++ b/HLT/TPCLib/calibration/AliHLTTPCCalibTimeComponent.cxx
@@ -27,11 +27,6 @@
 // or
 // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt   
 
-#if __GNUC__>= 3
-using namespace std;
-#endif
-
-
 #include "AliHLTTPCCalibTimeComponent.h"
 #include "AliHLTTPCDefinitions.h"
 #include "AliHLTMisc.h"
@@ -65,6 +60,8 @@ using namespace std;
 
 #include "AliHLTReadoutList.h"
 
+using namespace std;
+
 ClassImp(AliHLTTPCCalibTimeComponent) // ROOT macro for the implementation of ROOT specific class methods
 
 AliHLTTPCCalibTimeComponent::AliHLTTPCCalibTimeComponent()

diff --git a/HLT/TPCLib/calibration/AliHLTTPCCalibTimeGainComponent.cxx b/HLT/TPCLib/calibration/AliHLTTPCCalibTimeGainComponent.cxx
index 36cb5e6ee0fb928646ce41deeb17fd43bd89a3be..3721517929b6973301b21606f1c2eb47e8361835 100644 (file)
--- a/HLT/TPCLib/calibration/AliHLTTPCCalibTimeGainComponent.cxx
+++ b/HLT/TPCLib/calibration/AliHLTTPCCalibTimeGainComponent.cxx
@@ -27,10 +27,6 @@
 // or
 // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt   
 
-#if __GNUC__>= 3
-using namespace std;
-#endif
-
 #include "AliHLTTPCCalibTimeGainComponent.h"
 #include "AliHLTTPCDefinitions.h"
 #include "AliHLTReadoutList.h"
@@ -47,6 +43,7 @@ using namespace std;
 #include <cstdlib>
 #include <cerrno>
 
+using namespace std;
 
 ClassImp(AliHLTTPCCalibTimeGainComponent) // ROOT macro for the implementation of ROOT specific class methods
 

diff --git a/HLT/TPCLib/calibration/AliHLTTPCCalibTracksComponent.cxx b/HLT/TPCLib/calibration/AliHLTTPCCalibTracksComponent.cxx
index 73225addc325d646876adc91018e8f90fcda5ffe..570fa1c98c0c70a774666b88a0d2ec6e520f5c91 100644 (file)
--- a/HLT/TPCLib/calibration/AliHLTTPCCalibTracksComponent.cxx
+++ b/HLT/TPCLib/calibration/AliHLTTPCCalibTracksComponent.cxx
@@ -28,10 +28,6 @@
 // or
 // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt   
 
-#if __GNUC__>= 3
-using namespace std;
-#endif
-
 #include "AliHLTTPCCalibTracksComponent.h"
 
 #include "AliHLTTPCLogging.h"
@@ -57,6 +53,8 @@ using namespace std;
 #include <errno.h>
 #include "TString.h"
 
+using namespace std;
+
 //AliHLTTPCCalibTracksComponent gAliHLTTPCCalibTracksComponent;
 
 /** ROOT macro for the implementation of ROOT specific class methods */

diff --git a/HLT/TPCLib/calibration/AliHLTTPCCalibrationComponent.cxx b/HLT/TPCLib/calibration/AliHLTTPCCalibrationComponent.cxx
index 471e24e79fe66aa24eb262759d07faa114439da1..5aa7ea518a4b0af0b62a96774b0685e25beba400 100644 (file)
--- a/HLT/TPCLib/calibration/AliHLTTPCCalibrationComponent.cxx
+++ b/HLT/TPCLib/calibration/AliHLTTPCCalibrationComponent.cxx
@@ -27,10 +27,6 @@
 // or
 // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt   
 
-#if __GNUC__>= 3
-using namespace std;
-#endif
-
 #include "AliHLTTPCCalibrationComponent.h"
 #include "AliHLTTPCDefinitions.h"
 #include "AliHLTTPCAnalysisTaskcalib.h"
@@ -51,6 +47,8 @@ using namespace std;
 #include <cstdlib>
 #include <cerrno>
 
+using namespace std;
+
 ClassImp(AliHLTTPCCalibrationComponent) // ROOT macro for the implementation of ROOT specific class methods
 
 AliHLTTPCCalibrationComponent::AliHLTTPCCalibrationComponent()

diff --git a/HLT/TPCLib/test/testAliHLTTPCOfflineCluster.C b/HLT/TPCLib/test/testAliHLTTPCOfflineCluster.C
index 70f7cc113e5b82c3c29927df8390187ab69000b0..1ccea5b5206167b1a8f9f48219b1dec3d998e7b9 100644 (file)
--- a/HLT/TPCLib/test/testAliHLTTPCOfflineCluster.C
+++ b/HLT/TPCLib/test/testAliHLTTPCOfflineCluster.C
@@ -35,8 +35,6 @@
 #include <istream>
 #endif //__CINT__
 
-using namespace std;
-
 /////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////
@@ -51,6 +49,8 @@ using namespace std;
 
 #include "/scratch/prog/HLT/TPCLib/AliHLTTPCSpacePointData.h";
 
+using namespace std;
+
 int testAliHLTTPCOfflineCluster(){
 //#ifdef __CINT__
   //gSystem->Load("libAliHLTUtil.so");