Update for changes in Root TExMap, TExMapIter in trunk

(moving from Long_t to Long64_t type) once more
- now using  ROOT_SVN_REVISION instead of ROOT_VERSION_CODE
what fixes compilation with Root v5.24/00-patches.

diff --git a/MUON/AliMUONSt1GeometryBuilderV2.cxx b/MUON/AliMUONSt1GeometryBuilderV2.cxx
index d768080f2199c72cd6c48b212251a31b214bf75d..d31f728a1d3e7e8d8eae88de128722982ece9ffc 100644 (file)
--- a/MUON/AliMUONSt1GeometryBuilderV2.cxx
+++ b/MUON/AliMUONSt1GeometryBuilderV2.cxx
@@ -421,8 +421,7 @@ void AliMUONSt1GeometryBuilderV2::CreateQuadrant(Int_t chamber)
   
   Int_t nb = AliMpConstants::ManuMask(AliMp::kNonBendingPlane);
   TExMapIter it(&specialMap);
-#if ROOT_VERSION_CODE >= 334081
-//#if ROOT_VERSION_CODE >= 333824  // needed with Root v5.24.00-patches 
+#if ROOT_SVN_REVISION >= 30658
   Long64_t key;
   Long64_t value;
 #else

diff --git a/MUON/mapping/AliMpExMapIterator.cxx b/MUON/mapping/AliMpExMapIterator.cxx
index 92b0f91825934444f28c48dd9302bc6e1d4d1a64..9eb6406fe08ae1b47031f2c4b24b1fdfdceee1b5 100644 (file)
--- a/MUON/mapping/AliMpExMapIterator.cxx
+++ b/MUON/mapping/AliMpExMapIterator.cxx
@@ -87,8 +87,7 @@ AliMpExMapIterator::~AliMpExMapIterator()
 }
 
 //_____________________________________________________________________________
-#if ROOT_VERSION_CODE >= 334081
-//#if ROOT_VERSION_CODE >= 333824  // needed with Root v5.24.00-patches 
+#if ROOT_SVN_REVISION >= 30658
 Bool_t 
 AliMpExMapIterator::Next(Long64_t& index, TObject*& object)
 #else
@@ -98,8 +97,7 @@ AliMpExMapIterator::Next(Long_t& index, TObject*& object)
 {
 /// Move to next object in iteration
 
-#if ROOT_VERSION_CODE >= 334081
-//#if ROOT_VERSION_CODE >= 333824  // needed with Root v5.24.00-patches 
+#if ROOT_SVN_REVISION >= 30658
   Long64_t value(0);
 #else
   Long_t value(0);
@@ -124,8 +122,7 @@ AliMpExMapIterator::Next()
 /// Return the next object in iteration.
 /// The returned object must not be deleted by the user.  
 
-#if ROOT_VERSION_CODE >= 334081
-//#if ROOT_VERSION_CODE >= 333824  // needed with Root v5.24.00-patches 
+#if ROOT_SVN_REVISION >= 30658
   Long64_t dummy;
 #else
   Long_t dummy;
@@ -143,8 +140,7 @@ AliMpExMapIterator::Next(Int_t& key)
 /// The returned object must not be deleted by the user.  
 
   TObject* o;
-#if ROOT_VERSION_CODE >= 334081
-//#if ROOT_VERSION_CODE >= 333824  // needed with Root v5.24.00-patches 
+#if ROOT_SVN_REVISION >= 30658
   Long64_t index;
 #else
   Long_t index;
@@ -161,8 +157,7 @@ AliMpExMapIterator::Next(Int_t& keyFirst, Int_t& keySecond)
 /// Return the next object in iteration and fill the key.
 /// The returned object must not be deleted by the user.  
 
-#if ROOT_VERSION_CODE >= 334081
-//#if ROOT_VERSION_CODE >= 333824  // needed with Root v5.24.00-patches 
+#if ROOT_SVN_REVISION >= 30658
   Long64_t index;
 #else
   Long_t index;
@@ -181,8 +176,7 @@ AliMpExMapIterator::Next(TString& key)
 /// Return the next object in iteration and fill the key.
 /// The returned object must not be deleted by the user.  
 
-#if ROOT_VERSION_CODE >= 334081
-//#if ROOT_VERSION_CODE >= 333824  // needed with Root v5.24.00-patches 
+#if ROOT_SVN_REVISION >= 30658
   Long64_t index;
 #else
   Long_t index;

diff --git a/MUON/mapping/AliMpExMapIterator.h b/MUON/mapping/AliMpExMapIterator.h
index 3dbca1c09fefea0545bf454727592e3aeca7e2dd..7476e0692d8abef6bf22c827c98b3f95d79a0a88 100644 (file)
--- a/MUON/mapping/AliMpExMapIterator.h
+++ b/MUON/mapping/AliMpExMapIterator.h
@@ -48,8 +48,7 @@ public:
   virtual const TCollection* GetCollection() const;
 
 private:
-#if ROOT_VERSION_CODE >= 334081
-//#if ROOT_VERSION_CODE >= 333824  // needed with Root v5.24.00-patches 
+#if ROOT_SVN_REVISION >= 30658
     Bool_t Next(Long64_t& index, TObject*& object);
 #else    
     Bool_t Next(Long_t& index, TObject*& object);

diff --git a/MUON/mapping/AliMpManuStore.cxx b/MUON/mapping/AliMpManuStore.cxx
index d4ae85d08c7abbadd9dabfe69c6b36cc6e6ee972..a2f9e65b0fe9fed55494c9570a0a3285fc05b600 100644 (file)
--- a/MUON/mapping/AliMpManuStore.cxx
+++ b/MUON/mapping/AliMpManuStore.cxx
@@ -245,8 +245,7 @@ void  AliMpManuStore::ReplaceManu(Int_t detElemId, Int_t manuId, Int_t serialNb)
   // Loop over map
   TExMapIter it(&fManuToSerialNbs);
 
-#if ROOT_VERSION_CODE >= 334081
-//#if ROOT_VERSION_CODE >= 333824  // needed with Root v5.24.00-patches 
+#if ROOT_SVN_REVISION >= 30658
   Long64_t key;
   Long64_t value;
 #else
@@ -341,8 +340,7 @@ Bool_t  AliMpManuStore::WriteData(const TString& outDir)
     
     // Loop over map
     TExMapIter it2(&fManuToSerialNbs);
-#if ROOT_VERSION_CODE >= 334081
-//#if ROOT_VERSION_CODE >= 333824  // needed with Root v5.24.00-patches 
+#if ROOT_SVN_REVISION >= 30658
     Long64_t key;
     Long64_t value;
 #else